chrono-node 2.7.9 → 2.8.0
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/cjs/common/casualReferences.js +8 -10
- package/dist/cjs/common/casualReferences.js.map +1 -1
- package/dist/cjs/common/refiners/ForwardDateRefiner.js +33 -12
- package/dist/cjs/common/refiners/ForwardDateRefiner.js.map +1 -1
- package/dist/cjs/results.d.ts +1 -0
- package/dist/cjs/results.js +18 -13
- package/dist/cjs/results.js.map +1 -1
- package/dist/cjs/utils/dates.d.ts +3 -0
- package/dist/cjs/utils/dates.js +17 -0
- package/dist/cjs/utils/dates.js.map +1 -0
- package/dist/cjs/utils/dayjs.js.map +1 -1
- package/dist/esm/common/casualReferences.js +8 -10
- package/dist/esm/common/casualReferences.js.map +1 -1
- package/dist/esm/common/refiners/ForwardDateRefiner.js +14 -12
- package/dist/esm/common/refiners/ForwardDateRefiner.js.map +1 -1
- package/dist/esm/results.d.ts +1 -0
- package/dist/esm/results.js +17 -13
- package/dist/esm/results.js.map +1 -1
- package/dist/esm/utils/dates.d.ts +3 -0
- package/dist/esm/utils/dates.js +12 -0
- package/dist/esm/utils/dates.js.map +1 -0
- package/dist/esm/utils/dayjs.js.map +1 -1
- package/package.json +1 -1
- package/src/common/casualReferences.ts +8 -10
- package/src/common/refiners/ForwardDateRefiner.ts +17 -11
- package/src/results.ts +18 -13
- package/src/utils/dates.ts +24 -0
- package/src/utils/dayjs.ts +6 -0
- package/test/en/en_casual.test.ts +4 -1
- package/test/en/en_relative.test.ts +126 -39
- package/test/en/en_time_exp.test.ts +27 -18
- package/test/nl/nl_relative.test.ts +33 -17
- package/test/result.test.ts +24 -0
- package/test/system_timezone.test.ts +20 -4
|
@@ -9,19 +9,17 @@ const dayjs_1 = __importDefault(require("dayjs"));
|
|
|
9
9
|
const dayjs_2 = require("../utils/dayjs");
|
|
10
10
|
const types_1 = require("../types");
|
|
11
11
|
function now(reference) {
|
|
12
|
-
const targetDate = dayjs_1.default(reference.
|
|
12
|
+
const targetDate = dayjs_1.default(reference.getDateWithAdjustedTimezone());
|
|
13
13
|
const component = new results_1.ParsingComponents(reference, {});
|
|
14
14
|
dayjs_2.assignSimilarDate(component, targetDate);
|
|
15
15
|
dayjs_2.assignSimilarTime(component, targetDate);
|
|
16
|
-
|
|
17
|
-
component.assign("timezoneOffset", targetDate.utcOffset());
|
|
18
|
-
}
|
|
16
|
+
component.assign("timezoneOffset", reference.getTimezoneOffset());
|
|
19
17
|
component.addTag("casualReference/now");
|
|
20
18
|
return component;
|
|
21
19
|
}
|
|
22
20
|
exports.now = now;
|
|
23
21
|
function today(reference) {
|
|
24
|
-
const targetDate = dayjs_1.default(reference.
|
|
22
|
+
const targetDate = dayjs_1.default(reference.getDateWithAdjustedTimezone());
|
|
25
23
|
const component = new results_1.ParsingComponents(reference, {});
|
|
26
24
|
dayjs_2.assignSimilarDate(component, targetDate);
|
|
27
25
|
dayjs_2.implySimilarTime(component, targetDate);
|
|
@@ -42,7 +40,7 @@ function tomorrow(reference) {
|
|
|
42
40
|
}
|
|
43
41
|
exports.tomorrow = tomorrow;
|
|
44
42
|
function theDayAfter(reference, nDays) {
|
|
45
|
-
let targetDate = dayjs_1.default(reference.
|
|
43
|
+
let targetDate = dayjs_1.default(reference.getDateWithAdjustedTimezone());
|
|
46
44
|
const component = new results_1.ParsingComponents(reference, {});
|
|
47
45
|
targetDate = targetDate.add(nDays, "day");
|
|
48
46
|
dayjs_2.assignSimilarDate(component, targetDate);
|
|
@@ -51,7 +49,7 @@ function theDayAfter(reference, nDays) {
|
|
|
51
49
|
}
|
|
52
50
|
exports.theDayAfter = theDayAfter;
|
|
53
51
|
function tonight(reference, implyHour = 22) {
|
|
54
|
-
const targetDate = dayjs_1.default(reference.
|
|
52
|
+
const targetDate = dayjs_1.default(reference.getDateWithAdjustedTimezone());
|
|
55
53
|
const component = new results_1.ParsingComponents(reference, {});
|
|
56
54
|
dayjs_2.assignSimilarDate(component, targetDate);
|
|
57
55
|
component.imply("hour", implyHour);
|
|
@@ -61,7 +59,7 @@ function tonight(reference, implyHour = 22) {
|
|
|
61
59
|
}
|
|
62
60
|
exports.tonight = tonight;
|
|
63
61
|
function lastNight(reference, implyHour = 0) {
|
|
64
|
-
let targetDate = dayjs_1.default(reference.
|
|
62
|
+
let targetDate = dayjs_1.default(reference.getDateWithAdjustedTimezone());
|
|
65
63
|
const component = new results_1.ParsingComponents(reference, {});
|
|
66
64
|
if (targetDate.hour() < 6) {
|
|
67
65
|
targetDate = targetDate.add(-1, "day");
|
|
@@ -80,7 +78,7 @@ function evening(reference, implyHour = 20) {
|
|
|
80
78
|
}
|
|
81
79
|
exports.evening = evening;
|
|
82
80
|
function yesterdayEvening(reference, implyHour = 20) {
|
|
83
|
-
let targetDate = dayjs_1.default(reference.
|
|
81
|
+
let targetDate = dayjs_1.default(reference.getDateWithAdjustedTimezone());
|
|
84
82
|
const component = new results_1.ParsingComponents(reference, {});
|
|
85
83
|
targetDate = targetDate.add(-1, "day");
|
|
86
84
|
dayjs_2.assignSimilarDate(component, targetDate);
|
|
@@ -93,7 +91,7 @@ function yesterdayEvening(reference, implyHour = 20) {
|
|
|
93
91
|
exports.yesterdayEvening = yesterdayEvening;
|
|
94
92
|
function midnight(reference) {
|
|
95
93
|
const component = new results_1.ParsingComponents(reference, {});
|
|
96
|
-
const targetDate = dayjs_1.default(reference.
|
|
94
|
+
const targetDate = dayjs_1.default(reference.getDateWithAdjustedTimezone());
|
|
97
95
|
if (targetDate.hour() > 2) {
|
|
98
96
|
dayjs_2.implyTheNextDay(component, targetDate);
|
|
99
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"casualReferences.js","sourceRoot":"","sources":["../../../src/common/casualReferences.ts"],"names":[],"mappings":";;;;;;AAAA,wCAAsE;AACtE,kDAA0B;AAC1B,0CAMwB;AACxB,oCAAoC;AAEpC,SAAgB,GAAG,CAAC,SAAgC;IAChD,MAAM,UAAU,GAAG,eAAK,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"casualReferences.js","sourceRoot":"","sources":["../../../src/common/casualReferences.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,30 +1,51 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
2
21
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
22
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
23
|
};
|
|
5
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
25
|
const dayjs_1 = __importDefault(require("dayjs"));
|
|
7
|
-
const
|
|
26
|
+
const dates = __importStar(require("../../utils/dates"));
|
|
8
27
|
class ForwardDateRefiner {
|
|
9
28
|
refine(context, results) {
|
|
10
29
|
if (!context.option.forwardDate) {
|
|
11
30
|
return results;
|
|
12
31
|
}
|
|
13
32
|
results.forEach((result) => {
|
|
14
|
-
let refMoment = dayjs_1.default(context.
|
|
15
|
-
if (result.start.isOnlyTime() &&
|
|
16
|
-
|
|
17
|
-
|
|
33
|
+
let refMoment = dayjs_1.default(context.reference.getDateWithAdjustedTimezone());
|
|
34
|
+
if (result.start.isOnlyTime() && context.reference.instant > result.start.date()) {
|
|
35
|
+
const refDate = context.reference.getDateWithAdjustedTimezone();
|
|
36
|
+
const refFollowingDay = new Date(refDate);
|
|
37
|
+
refFollowingDay.setDate(refFollowingDay.getDate() + 1);
|
|
38
|
+
dates.implySimilarDate(result.start, refFollowingDay);
|
|
39
|
+
context.debug(() => {
|
|
40
|
+
console.log(`${this.constructor.name} adjusted ${result} time from the ref date (${refDate}) to the following day (${refFollowingDay})`);
|
|
41
|
+
});
|
|
18
42
|
if (result.end && result.end.isOnlyTime()) {
|
|
19
|
-
|
|
20
|
-
if (result.start.
|
|
21
|
-
|
|
22
|
-
|
|
43
|
+
dates.implySimilarDate(result.end, refFollowingDay);
|
|
44
|
+
if (result.start.date() > result.end.date()) {
|
|
45
|
+
refFollowingDay.setDate(refFollowingDay.getDate() + 1);
|
|
46
|
+
dates.implySimilarDate(result.end, refFollowingDay);
|
|
23
47
|
}
|
|
24
48
|
}
|
|
25
|
-
context.debug(() => {
|
|
26
|
-
console.log(`${this.constructor.name} adjusted ${result} time result (${result.start})`);
|
|
27
|
-
});
|
|
28
49
|
}
|
|
29
50
|
if (result.start.isOnlyWeekdayComponent() && refMoment.isAfter(result.start.dayjs())) {
|
|
30
51
|
if (refMoment.day() >= result.start.get("weekday")) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ForwardDateRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ForwardDateRefiner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ForwardDateRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ForwardDateRefiner.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/results.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ export declare class ReferenceWithTimezone {
|
|
|
6
6
|
constructor(input?: ParsingReference | Date);
|
|
7
7
|
getDateWithAdjustedTimezone(): Date;
|
|
8
8
|
getSystemTimezoneAdjustmentMinute(date?: Date, overrideTimezoneOffset?: number): number;
|
|
9
|
+
getTimezoneOffset(): number;
|
|
9
10
|
}
|
|
10
11
|
export declare class ParsingComponents implements ParsedComponents {
|
|
11
12
|
private knownValues;
|
package/dist/cjs/results.js
CHANGED
|
@@ -15,6 +15,7 @@ class ReferenceWithTimezone {
|
|
|
15
15
|
input = input !== null && input !== void 0 ? input : new Date();
|
|
16
16
|
if (input instanceof Date) {
|
|
17
17
|
this.instant = input;
|
|
18
|
+
this.timezoneOffset = null;
|
|
18
19
|
}
|
|
19
20
|
else {
|
|
20
21
|
this.instant = (_a = input.instant) !== null && _a !== void 0 ? _a : new Date();
|
|
@@ -22,7 +23,11 @@ class ReferenceWithTimezone {
|
|
|
22
23
|
}
|
|
23
24
|
}
|
|
24
25
|
getDateWithAdjustedTimezone() {
|
|
25
|
-
|
|
26
|
+
const date = new Date(this.instant);
|
|
27
|
+
if (this.timezoneOffset !== null) {
|
|
28
|
+
date.setMinutes(date.getMinutes() - this.getSystemTimezoneAdjustmentMinute(this.instant));
|
|
29
|
+
}
|
|
30
|
+
return date;
|
|
26
31
|
}
|
|
27
32
|
getSystemTimezoneAdjustmentMinute(date, overrideTimezoneOffset) {
|
|
28
33
|
var _a;
|
|
@@ -33,6 +38,10 @@ class ReferenceWithTimezone {
|
|
|
33
38
|
const targetTimezoneOffset = (_a = overrideTimezoneOffset !== null && overrideTimezoneOffset !== void 0 ? overrideTimezoneOffset : this.timezoneOffset) !== null && _a !== void 0 ? _a : currentTimezoneOffset;
|
|
34
39
|
return currentTimezoneOffset - targetTimezoneOffset;
|
|
35
40
|
}
|
|
41
|
+
getTimezoneOffset() {
|
|
42
|
+
var _a;
|
|
43
|
+
return (_a = this.timezoneOffset) !== null && _a !== void 0 ? _a : -this.instant.getTimezoneOffset();
|
|
44
|
+
}
|
|
36
45
|
}
|
|
37
46
|
exports.ReferenceWithTimezone = ReferenceWithTimezone;
|
|
38
47
|
class ParsingComponents {
|
|
@@ -46,10 +55,10 @@ class ParsingComponents {
|
|
|
46
55
|
this.knownValues[key] = knownComponents[key];
|
|
47
56
|
}
|
|
48
57
|
}
|
|
49
|
-
const refDayJs =
|
|
50
|
-
this.imply("day", refDayJs.
|
|
51
|
-
this.imply("month", refDayJs.
|
|
52
|
-
this.imply("year", refDayJs.
|
|
58
|
+
const refDayJs = reference.getDateWithAdjustedTimezone();
|
|
59
|
+
this.imply("day", refDayJs.getDate());
|
|
60
|
+
this.imply("month", refDayJs.getMonth() + 1);
|
|
61
|
+
this.imply("year", refDayJs.getFullYear());
|
|
53
62
|
this.imply("hour", 12);
|
|
54
63
|
this.imply("minute", 0);
|
|
55
64
|
this.imply("second", 0);
|
|
@@ -132,7 +141,7 @@ class ParsingComponents {
|
|
|
132
141
|
reference: ${JSON.stringify(this.reference)}]`;
|
|
133
142
|
}
|
|
134
143
|
dayjs() {
|
|
135
|
-
return dayjs_1.default(this.
|
|
144
|
+
return dayjs_1.default(this.dateWithoutTimezoneAdjustment());
|
|
136
145
|
}
|
|
137
146
|
date() {
|
|
138
147
|
const date = this.dateWithoutTimezoneAdjustment();
|
|
@@ -158,7 +167,7 @@ class ParsingComponents {
|
|
|
158
167
|
return date;
|
|
159
168
|
}
|
|
160
169
|
static createRelativeFromReference(reference, fragments) {
|
|
161
|
-
let date = dayjs_1.default(reference.
|
|
170
|
+
let date = dayjs_1.default(reference.getDateWithAdjustedTimezone());
|
|
162
171
|
for (const key in fragments) {
|
|
163
172
|
date = date.add(fragments[key], key);
|
|
164
173
|
}
|
|
@@ -168,15 +177,11 @@ class ParsingComponents {
|
|
|
168
177
|
components.addTag("result/relativeDateAndTime");
|
|
169
178
|
dayjs_2.assignSimilarTime(components, date);
|
|
170
179
|
dayjs_2.assignSimilarDate(components, date);
|
|
171
|
-
|
|
172
|
-
components.assign("timezoneOffset", -reference.instant.getTimezoneOffset());
|
|
173
|
-
}
|
|
180
|
+
components.assign("timezoneOffset", reference.getTimezoneOffset());
|
|
174
181
|
}
|
|
175
182
|
else {
|
|
176
183
|
dayjs_2.implySimilarTime(components, date);
|
|
177
|
-
|
|
178
|
-
components.imply("timezoneOffset", -reference.instant.getTimezoneOffset());
|
|
179
|
-
}
|
|
184
|
+
components.imply("timezoneOffset", reference.getTimezoneOffset());
|
|
180
185
|
if (fragments["d"]) {
|
|
181
186
|
components.assign("day", date.date());
|
|
182
187
|
components.assign("month", date.month() + 1);
|
package/dist/cjs/results.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"results.js","sourceRoot":"","sources":["../../src/results.ts"],"names":[],"mappings":";;;;;;AAEA,+EAAuD;AACvD,kDAAyC;AACzC,yCAAuF;AACvF,yCAA8C;AAC9C,eAAK,CAAC,MAAM,CAAC,uBAAa,CAAC,CAAC;AAE5B,MAAa,qBAAqB;IAI9B,YAAY,KAA+B;;QACvC,KAAK,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,IAAI,EAAE,CAAC;QAC5B,IAAI,KAAK,YAAY,IAAI,EAAE;YACvB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"results.js","sourceRoot":"","sources":["../../src/results.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.implySimilarTime = exports.implySimilarDate = void 0;
|
|
4
|
+
function implySimilarDate(component, target) {
|
|
5
|
+
component.imply("day", target.getDate());
|
|
6
|
+
component.imply("month", target.getMonth() + 1);
|
|
7
|
+
component.imply("year", target.getFullYear());
|
|
8
|
+
}
|
|
9
|
+
exports.implySimilarDate = implySimilarDate;
|
|
10
|
+
function implySimilarTime(component, target) {
|
|
11
|
+
component.imply("hour", target.getHours());
|
|
12
|
+
component.imply("minute", target.getMinutes());
|
|
13
|
+
component.imply("second", target.getSeconds());
|
|
14
|
+
component.imply("millisecond", target.getMilliseconds());
|
|
15
|
+
}
|
|
16
|
+
exports.implySimilarTime = implySimilarTime;
|
|
17
|
+
//# sourceMappingURL=dates.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dates.js","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":";;;AAOA,SAAgB,gBAAgB,CAAC,SAA4B,EAAE,MAAY;IACvE,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACzC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IAChD,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;AAClD,CAAC;AAJD,4CAIC;AAOD,SAAgB,gBAAgB,CAAC,SAA4B,EAAE,MAAY;IACvE,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3C,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;AAC7D,CAAC;AALD,4CAKC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dayjs.js","sourceRoot":"","sources":["../../../src/utils/dayjs.ts"],"names":[],"mappings":";;;AAEA,oCAAoC;AAEpC,SAAgB,gBAAgB,CAAC,SAA4B,EAAE,WAAwB;IACnF,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACxC,iBAAiB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC1C,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAC7C,CAAC;AAJD,4CAIC;AAED,SAAgB,eAAe,CAAC,SAA4B,EAAE,WAAwB;IAClF,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACxC,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACzC,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAC7C,CAAC;AAJD,0CAIC;AAED,SAAgB,iBAAiB,CAAC,SAA4B,EAAE,WAAwB;IACpF,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5C,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IACnD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;AACjD,CAAC;AAJD,8CAIC;AAED,SAAgB,iBAAiB,CAAC,SAA4B,EAAE,WAAwB;IACpF,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7C,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IACjD,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IACjD,SAAS,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;IAC3D,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE;QAC5B,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;KAC7C;SAAM;QACH,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;KAC7C;AACL,CAAC;AAVD,8CAUC;
|
|
1
|
+
{"version":3,"file":"dayjs.js","sourceRoot":"","sources":["../../../src/utils/dayjs.ts"],"names":[],"mappings":";;;AAEA,oCAAoC;AAEpC,SAAgB,gBAAgB,CAAC,SAA4B,EAAE,WAAwB;IACnF,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACxC,iBAAiB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC1C,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAC7C,CAAC;AAJD,4CAIC;AAED,SAAgB,eAAe,CAAC,SAA4B,EAAE,WAAwB;IAClF,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACxC,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACzC,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAC7C,CAAC;AAJD,0CAIC;AAED,SAAgB,iBAAiB,CAAC,SAA4B,EAAE,WAAwB;IACpF,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5C,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IACnD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;AACjD,CAAC;AAJD,8CAIC;AAED,SAAgB,iBAAiB,CAAC,SAA4B,EAAE,WAAwB;IACpF,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7C,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IACjD,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IACjD,SAAS,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;IAC3D,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE;QAC5B,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;KAC7C;SAAM;QACH,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;KAC7C;AACL,CAAC;AAVD,8CAUC;AAKD,SAAgB,gBAAgB,CAAC,SAA4B,EAAE,WAAwB;IACnF,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3C,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAClD,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;AAChD,CAAC;AAJD,4CAIC;AAKD,SAAgB,gBAAgB,CAAC,SAA4B,EAAE,WAAwB;IACnF,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5C,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;AAC9D,CAAC;AALD,4CAKC"}
|
|
@@ -3,18 +3,16 @@ import dayjs from "dayjs";
|
|
|
3
3
|
import { assignSimilarDate, assignSimilarTime, implySimilarTime, implyTheNextDay, } from "../utils/dayjs.js";
|
|
4
4
|
import { Meridiem } from "../types.js";
|
|
5
5
|
export function now(reference) {
|
|
6
|
-
const targetDate = dayjs(reference.
|
|
6
|
+
const targetDate = dayjs(reference.getDateWithAdjustedTimezone());
|
|
7
7
|
const component = new ParsingComponents(reference, {});
|
|
8
8
|
assignSimilarDate(component, targetDate);
|
|
9
9
|
assignSimilarTime(component, targetDate);
|
|
10
|
-
|
|
11
|
-
component.assign("timezoneOffset", targetDate.utcOffset());
|
|
12
|
-
}
|
|
10
|
+
component.assign("timezoneOffset", reference.getTimezoneOffset());
|
|
13
11
|
component.addTag("casualReference/now");
|
|
14
12
|
return component;
|
|
15
13
|
}
|
|
16
14
|
export function today(reference) {
|
|
17
|
-
const targetDate = dayjs(reference.
|
|
15
|
+
const targetDate = dayjs(reference.getDateWithAdjustedTimezone());
|
|
18
16
|
const component = new ParsingComponents(reference, {});
|
|
19
17
|
assignSimilarDate(component, targetDate);
|
|
20
18
|
implySimilarTime(component, targetDate);
|
|
@@ -31,7 +29,7 @@ export function tomorrow(reference) {
|
|
|
31
29
|
return theDayAfter(reference, 1).addTag("casualReference/tomorrow");
|
|
32
30
|
}
|
|
33
31
|
export function theDayAfter(reference, nDays) {
|
|
34
|
-
let targetDate = dayjs(reference.
|
|
32
|
+
let targetDate = dayjs(reference.getDateWithAdjustedTimezone());
|
|
35
33
|
const component = new ParsingComponents(reference, {});
|
|
36
34
|
targetDate = targetDate.add(nDays, "day");
|
|
37
35
|
assignSimilarDate(component, targetDate);
|
|
@@ -39,7 +37,7 @@ export function theDayAfter(reference, nDays) {
|
|
|
39
37
|
return component;
|
|
40
38
|
}
|
|
41
39
|
export function tonight(reference, implyHour = 22) {
|
|
42
|
-
const targetDate = dayjs(reference.
|
|
40
|
+
const targetDate = dayjs(reference.getDateWithAdjustedTimezone());
|
|
43
41
|
const component = new ParsingComponents(reference, {});
|
|
44
42
|
assignSimilarDate(component, targetDate);
|
|
45
43
|
component.imply("hour", implyHour);
|
|
@@ -48,7 +46,7 @@ export function tonight(reference, implyHour = 22) {
|
|
|
48
46
|
return component;
|
|
49
47
|
}
|
|
50
48
|
export function lastNight(reference, implyHour = 0) {
|
|
51
|
-
let targetDate = dayjs(reference.
|
|
49
|
+
let targetDate = dayjs(reference.getDateWithAdjustedTimezone());
|
|
52
50
|
const component = new ParsingComponents(reference, {});
|
|
53
51
|
if (targetDate.hour() < 6) {
|
|
54
52
|
targetDate = targetDate.add(-1, "day");
|
|
@@ -65,7 +63,7 @@ export function evening(reference, implyHour = 20) {
|
|
|
65
63
|
return component;
|
|
66
64
|
}
|
|
67
65
|
export function yesterdayEvening(reference, implyHour = 20) {
|
|
68
|
-
let targetDate = dayjs(reference.
|
|
66
|
+
let targetDate = dayjs(reference.getDateWithAdjustedTimezone());
|
|
69
67
|
const component = new ParsingComponents(reference, {});
|
|
70
68
|
targetDate = targetDate.add(-1, "day");
|
|
71
69
|
assignSimilarDate(component, targetDate);
|
|
@@ -77,7 +75,7 @@ export function yesterdayEvening(reference, implyHour = 20) {
|
|
|
77
75
|
}
|
|
78
76
|
export function midnight(reference) {
|
|
79
77
|
const component = new ParsingComponents(reference, {});
|
|
80
|
-
const targetDate = dayjs(reference.
|
|
78
|
+
const targetDate = dayjs(reference.getDateWithAdjustedTimezone());
|
|
81
79
|
if (targetDate.hour() > 2) {
|
|
82
80
|
implyTheNextDay(component, targetDate);
|
|
83
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"casualReferences.js","sourceRoot":"","sources":["../../../src/common/casualReferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAyB,MAAM,YAAY,CAAC;AACtE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACH,iBAAiB,EACjB,iBAAiB,EAEjB,gBAAgB,EAChB,eAAe,GAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,MAAM,UAAU,GAAG,CAAC,SAAgC;IAChD,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"casualReferences.js","sourceRoot":"","sources":["../../../src/common/casualReferences.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,25 +1,27 @@
|
|
|
1
1
|
import dayjs from "dayjs";
|
|
2
|
-
import
|
|
2
|
+
import * as dates from "../../utils/dates.js";
|
|
3
3
|
export default class ForwardDateRefiner {
|
|
4
4
|
refine(context, results) {
|
|
5
5
|
if (!context.option.forwardDate) {
|
|
6
6
|
return results;
|
|
7
7
|
}
|
|
8
8
|
results.forEach((result) => {
|
|
9
|
-
let refMoment = dayjs(context.
|
|
10
|
-
if (result.start.isOnlyTime() &&
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
let refMoment = dayjs(context.reference.getDateWithAdjustedTimezone());
|
|
10
|
+
if (result.start.isOnlyTime() && context.reference.instant > result.start.date()) {
|
|
11
|
+
const refDate = context.reference.getDateWithAdjustedTimezone();
|
|
12
|
+
const refFollowingDay = new Date(refDate);
|
|
13
|
+
refFollowingDay.setDate(refFollowingDay.getDate() + 1);
|
|
14
|
+
dates.implySimilarDate(result.start, refFollowingDay);
|
|
15
|
+
context.debug(() => {
|
|
16
|
+
console.log(`${this.constructor.name} adjusted ${result} time from the ref date (${refDate}) to the following day (${refFollowingDay})`);
|
|
17
|
+
});
|
|
13
18
|
if (result.end && result.end.isOnlyTime()) {
|
|
14
|
-
implySimilarDate(result.end,
|
|
15
|
-
if (result.start.
|
|
16
|
-
|
|
17
|
-
implySimilarDate(result.end,
|
|
19
|
+
dates.implySimilarDate(result.end, refFollowingDay);
|
|
20
|
+
if (result.start.date() > result.end.date()) {
|
|
21
|
+
refFollowingDay.setDate(refFollowingDay.getDate() + 1);
|
|
22
|
+
dates.implySimilarDate(result.end, refFollowingDay);
|
|
18
23
|
}
|
|
19
24
|
}
|
|
20
|
-
context.debug(() => {
|
|
21
|
-
console.log(`${this.constructor.name} adjusted ${result} time result (${result.start})`);
|
|
22
|
-
});
|
|
23
25
|
}
|
|
24
26
|
if (result.start.isOnlyWeekdayComponent() && refMoment.isAfter(result.start.dayjs())) {
|
|
25
27
|
if (refMoment.day() >= result.start.get("weekday")) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ForwardDateRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ForwardDateRefiner.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ForwardDateRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ForwardDateRefiner.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/results.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ export declare class ReferenceWithTimezone {
|
|
|
6
6
|
constructor(input?: ParsingReference | Date);
|
|
7
7
|
getDateWithAdjustedTimezone(): Date;
|
|
8
8
|
getSystemTimezoneAdjustmentMinute(date?: Date, overrideTimezoneOffset?: number): number;
|
|
9
|
+
getTimezoneOffset(): number;
|
|
9
10
|
}
|
|
10
11
|
export declare class ParsingComponents implements ParsedComponents {
|
|
11
12
|
private knownValues;
|
package/dist/esm/results.js
CHANGED
|
@@ -8,6 +8,7 @@ export class ReferenceWithTimezone {
|
|
|
8
8
|
input = input ?? new Date();
|
|
9
9
|
if (input instanceof Date) {
|
|
10
10
|
this.instant = input;
|
|
11
|
+
this.timezoneOffset = null;
|
|
11
12
|
}
|
|
12
13
|
else {
|
|
13
14
|
this.instant = input.instant ?? new Date();
|
|
@@ -15,7 +16,11 @@ export class ReferenceWithTimezone {
|
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
getDateWithAdjustedTimezone() {
|
|
18
|
-
|
|
19
|
+
const date = new Date(this.instant);
|
|
20
|
+
if (this.timezoneOffset !== null) {
|
|
21
|
+
date.setMinutes(date.getMinutes() - this.getSystemTimezoneAdjustmentMinute(this.instant));
|
|
22
|
+
}
|
|
23
|
+
return date;
|
|
19
24
|
}
|
|
20
25
|
getSystemTimezoneAdjustmentMinute(date, overrideTimezoneOffset) {
|
|
21
26
|
if (!date || date.getTime() < 0) {
|
|
@@ -25,6 +30,9 @@ export class ReferenceWithTimezone {
|
|
|
25
30
|
const targetTimezoneOffset = overrideTimezoneOffset ?? this.timezoneOffset ?? currentTimezoneOffset;
|
|
26
31
|
return currentTimezoneOffset - targetTimezoneOffset;
|
|
27
32
|
}
|
|
33
|
+
getTimezoneOffset() {
|
|
34
|
+
return this.timezoneOffset ?? -this.instant.getTimezoneOffset();
|
|
35
|
+
}
|
|
28
36
|
}
|
|
29
37
|
export class ParsingComponents {
|
|
30
38
|
constructor(reference, knownComponents) {
|
|
@@ -37,10 +45,10 @@ export class ParsingComponents {
|
|
|
37
45
|
this.knownValues[key] = knownComponents[key];
|
|
38
46
|
}
|
|
39
47
|
}
|
|
40
|
-
const refDayJs =
|
|
41
|
-
this.imply("day", refDayJs.
|
|
42
|
-
this.imply("month", refDayJs.
|
|
43
|
-
this.imply("year", refDayJs.
|
|
48
|
+
const refDayJs = reference.getDateWithAdjustedTimezone();
|
|
49
|
+
this.imply("day", refDayJs.getDate());
|
|
50
|
+
this.imply("month", refDayJs.getMonth() + 1);
|
|
51
|
+
this.imply("year", refDayJs.getFullYear());
|
|
44
52
|
this.imply("hour", 12);
|
|
45
53
|
this.imply("minute", 0);
|
|
46
54
|
this.imply("second", 0);
|
|
@@ -123,7 +131,7 @@ export class ParsingComponents {
|
|
|
123
131
|
reference: ${JSON.stringify(this.reference)}]`;
|
|
124
132
|
}
|
|
125
133
|
dayjs() {
|
|
126
|
-
return dayjs(this.
|
|
134
|
+
return dayjs(this.dateWithoutTimezoneAdjustment());
|
|
127
135
|
}
|
|
128
136
|
date() {
|
|
129
137
|
const date = this.dateWithoutTimezoneAdjustment();
|
|
@@ -149,7 +157,7 @@ export class ParsingComponents {
|
|
|
149
157
|
return date;
|
|
150
158
|
}
|
|
151
159
|
static createRelativeFromReference(reference, fragments) {
|
|
152
|
-
let date = dayjs(reference.
|
|
160
|
+
let date = dayjs(reference.getDateWithAdjustedTimezone());
|
|
153
161
|
for (const key in fragments) {
|
|
154
162
|
date = date.add(fragments[key], key);
|
|
155
163
|
}
|
|
@@ -159,15 +167,11 @@ export class ParsingComponents {
|
|
|
159
167
|
components.addTag("result/relativeDateAndTime");
|
|
160
168
|
assignSimilarTime(components, date);
|
|
161
169
|
assignSimilarDate(components, date);
|
|
162
|
-
|
|
163
|
-
components.assign("timezoneOffset", -reference.instant.getTimezoneOffset());
|
|
164
|
-
}
|
|
170
|
+
components.assign("timezoneOffset", reference.getTimezoneOffset());
|
|
165
171
|
}
|
|
166
172
|
else {
|
|
167
173
|
implySimilarTime(components, date);
|
|
168
|
-
|
|
169
|
-
components.imply("timezoneOffset", -reference.instant.getTimezoneOffset());
|
|
170
|
-
}
|
|
174
|
+
components.imply("timezoneOffset", reference.getTimezoneOffset());
|
|
171
175
|
if (fragments["d"]) {
|
|
172
176
|
components.assign("day", date.date());
|
|
173
177
|
components.assign("month", date.month() + 1);
|