chrono-node 2.7.5 → 2.7.7
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/README.md +1 -1
- package/dist/cjs/common/parsers/AbstractTimeExpressionParser.js +11 -2
- package/dist/cjs/common/parsers/AbstractTimeExpressionParser.js.map +1 -1
- package/dist/cjs/common/parsers/ISOFormatParser.d.ts +1 -12
- package/dist/cjs/common/parsers/ISOFormatParser.js +30 -28
- package/dist/cjs/common/parsers/ISOFormatParser.js.map +1 -1
- package/dist/cjs/common/parsers/SlashDateFormatParser.js +13 -6
- package/dist/cjs/common/parsers/SlashDateFormatParser.js.map +1 -1
- package/dist/cjs/common/refiners/ForwardDateRefiner.js +8 -5
- package/dist/cjs/common/refiners/ForwardDateRefiner.js.map +1 -1
- package/dist/cjs/locales/en/configuration.js +4 -2
- package/dist/cjs/locales/en/configuration.js.map +1 -1
- package/dist/cjs/locales/en/constants.d.ts +1 -1
- package/dist/cjs/locales/en/constants.js +6 -0
- package/dist/cjs/locales/en/constants.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENMonthNameLittleEndianParser.js +1 -1
- package/dist/cjs/locales/en/parsers/ENMonthNameLittleEndianParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js +3 -0
- package/dist/cjs/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js +3 -0
- package/dist/cjs/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js +5 -2
- package/dist/cjs/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js +3 -0
- package/dist/cjs/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/cjs/locales/en/parsers/{ENCasualYearMonthDayParser.d.ts → ENYearMonthDayParser.d.ts} +3 -1
- package/dist/cjs/locales/en/parsers/{ENCasualYearMonthDayParser.js → ENYearMonthDayParser.js} +20 -8
- package/dist/cjs/locales/en/parsers/ENYearMonthDayParser.js.map +1 -0
- package/dist/cjs/locales/en/refiners/ENExtractYearSuffixRefiner.d.ts +5 -0
- package/dist/cjs/locales/en/refiners/ENExtractYearSuffixRefiner.js +31 -0
- package/dist/cjs/locales/en/refiners/ENExtractYearSuffixRefiner.js.map +1 -0
- package/dist/cjs/locales/en/refiners/ENMergeDateTimeRefiner.js +1 -1
- package/dist/cjs/locales/en/refiners/ENMergeDateTimeRefiner.js.map +1 -1
- package/dist/cjs/locales/zh/index.d.ts +12 -1
- package/dist/cjs/locales/zh/index.js +65 -5
- package/dist/cjs/locales/zh/index.js.map +1 -1
- package/dist/cjs/results.js +7 -4
- package/dist/cjs/results.js.map +1 -1
- package/dist/esm/common/parsers/AbstractTimeExpressionParser.js +11 -2
- package/dist/esm/common/parsers/AbstractTimeExpressionParser.js.map +1 -1
- package/dist/esm/common/parsers/ISOFormatParser.d.ts +1 -12
- package/dist/esm/common/parsers/ISOFormatParser.js +30 -28
- package/dist/esm/common/parsers/ISOFormatParser.js.map +1 -1
- package/dist/esm/common/parsers/SlashDateFormatParser.js +13 -6
- package/dist/esm/common/parsers/SlashDateFormatParser.js.map +1 -1
- package/dist/esm/common/refiners/ForwardDateRefiner.js +8 -5
- package/dist/esm/common/refiners/ForwardDateRefiner.js.map +1 -1
- package/dist/esm/locales/en/configuration.js +4 -2
- package/dist/esm/locales/en/configuration.js.map +1 -1
- package/dist/esm/locales/en/constants.d.ts +1 -1
- package/dist/esm/locales/en/constants.js +6 -0
- package/dist/esm/locales/en/constants.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENMonthNameLittleEndianParser.js +1 -1
- package/dist/esm/locales/en/parsers/ENMonthNameLittleEndianParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitAgoFormatParser.js +3 -0
- package/dist/esm/locales/en/parsers/ENTimeUnitAgoFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js +3 -0
- package/dist/esm/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitLaterFormatParser.js +5 -2
- package/dist/esm/locales/en/parsers/ENTimeUnitLaterFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js +3 -0
- package/dist/esm/locales/en/parsers/ENTimeUnitWithinFormatParser.js.map +1 -1
- package/dist/esm/locales/en/parsers/{ENCasualYearMonthDayParser.d.ts → ENYearMonthDayParser.d.ts} +3 -1
- package/dist/esm/locales/en/parsers/{ENCasualYearMonthDayParser.js → ENYearMonthDayParser.js} +19 -7
- package/dist/esm/locales/en/parsers/ENYearMonthDayParser.js.map +1 -0
- package/dist/esm/locales/en/refiners/ENExtractYearSuffixRefiner.d.ts +5 -0
- package/dist/esm/locales/en/refiners/ENExtractYearSuffixRefiner.js +28 -0
- package/dist/esm/locales/en/refiners/ENExtractYearSuffixRefiner.js.map +1 -0
- package/dist/esm/locales/en/refiners/ENMergeDateTimeRefiner.js +1 -1
- package/dist/esm/locales/en/refiners/ENMergeDateTimeRefiner.js.map +1 -1
- package/dist/esm/locales/zh/index.d.ts +12 -1
- package/dist/esm/locales/zh/index.js +53 -1
- package/dist/esm/locales/zh/index.js.map +1 -1
- package/dist/esm/results.js +7 -4
- package/dist/esm/results.js.map +1 -1
- package/package.json +1 -1
- package/src/common/parsers/AbstractTimeExpressionParser.ts +16 -2
- package/src/common/parsers/ISOFormatParser.ts +30 -32
- package/src/common/parsers/SlashDateFormatParser.ts +13 -10
- package/src/common/refiners/ForwardDateRefiner.ts +8 -5
- package/src/locales/en/configuration.ts +8 -2
- package/src/locales/en/constants.ts +7 -1
- package/src/locales/en/parsers/ENMonthNameLittleEndianParser.ts +1 -1
- package/src/locales/en/parsers/ENTimeUnitAgoFormatParser.ts +3 -1
- package/src/locales/en/parsers/ENTimeUnitCasualRelativeFormatParser.ts +4 -2
- package/src/locales/en/parsers/ENTimeUnitLaterFormatParser.ts +5 -2
- package/src/locales/en/parsers/ENTimeUnitWithinFormatParser.ts +4 -2
- package/src/locales/en/parsers/{ENCasualYearMonthDayParser.ts → ENYearMonthDayParser.ts} +18 -7
- package/src/locales/en/refiners/ENExtractYearSuffixRefiner.ts +34 -0
- package/src/locales/en/refiners/ENMergeDateTimeRefiner.ts +1 -1
- package/src/locales/zh/index.ts +73 -1
- package/src/results.ts +8 -5
- package/test/en/en_casual.test.ts +6 -0
- package/test/en/en_inter_std.test.ts +30 -28
- package/test/en/en_merging_relative_dates.test.ts +3 -4
- package/test/en/en_slash.test.ts +62 -42
- package/test/en/en_time_exp.test.ts +88 -0
- package/test/en/en_time_units_ago.test.ts +34 -0
- package/test/en/en_time_units_casual_relative.test.ts +3 -0
- package/test/en/en_time_units_later.test.ts +4 -0
- package/test/en/en_time_units_within.test.ts +5 -0
- package/test/en/en_year.test.ts +26 -1
- package/test/en/{en_casual_year_month_day.test.ts → en_year_month_day.test.ts} +25 -4
- package/test/system.test.ts +2 -0
- package/test/system_timezone.test.ts +11 -0
- package/test/zh/{zh_hans_casual.test.ts → hans/zh_hans_casual.test.ts} +2 -2
- package/test/zh/{zh_hans_date.test.ts → hans/zh_hans_date.test.ts} +2 -2
- package/test/zh/{zh_hans_deadline.test.ts → hans/zh_hans_deadline.test.ts} +2 -2
- package/test/zh/{zh_hans_time_exp.test.ts → hans/zh_hans_time_exp.test.ts} +16 -2
- package/test/zh/{zh_hans_weekday.test.ts → hans/zh_hans_weekday.test.ts} +2 -2
- package/test/zh/{zh_hant_casual.test.ts → hant/zh_hant_casual.test.ts} +2 -2
- package/test/zh/{zh_hant_date.test.ts → hant/zh_hant_date.test.ts} +2 -2
- package/test/zh/{zh_hant_deadline.test.ts → hant/zh_hant_deadline.test.ts} +2 -2
- package/test/zh/{zh_hant_time_exp.test.ts → hant/zh_hant_time_exp.test.ts} +2 -2
- package/test/zh/{zh_hant_weekday.test.ts → hant/zh_hant_weekday.test.ts} +2 -2
- package/test/zh/zh.test.ts +18 -0
- package/dist/cjs/locales/en/parsers/ENCasualYearMonthDayParser.js.map +0 -1
- package/dist/esm/locales/en/parsers/ENCasualYearMonthDayParser.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ENYearMonthDayParser.js","sourceRoot":"","sources":["../../../../../src/locales/en/parsers/ENYearMonthDayParser.ts"],"names":[],"mappings":";;AACA,4CAAgD;AAChD,oDAAyD;AACzD,2GAAgH;AAShH,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,wBAAwB;IACpB,OAAO,yBAAe,CAAC,4BAAgB,CAAC,6BAA6B;IACrE,cAAc;IACd,WAAW,EACf,GAAG,CACN,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAqB,oBAAqB,SAAQ,uEAAsC;IACpF,YAAoB,oBAA6B;QAC7C,KAAK,EAAE,CAAC;QADQ,yBAAoB,GAApB,oBAAoB,CAAS;IAEjD,CAAC;IAED,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAChD,IAAI,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC7C,IAAI,KAAK,GAAG,KAAK,CAAC,kBAAkB,CAAC;YACjC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACrC,CAAC,CAAC,4BAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAE9D,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE,EAAE;YACzB,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC3B,OAAO,IAAI,CAAC;aACf;YACD,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,EAAE,EAAE;gBACvB,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aAC/B;SACJ;QACD,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC;SACf;QAED,OAAO;YACH,GAAG,EAAE,GAAG;YACR,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,IAAI;SACb,CAAC;IACN,CAAC;CACJ;AAlCD,uCAkCC"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const constants_1 = require("../constants");
|
|
4
|
+
const YEAR_SUFFIX_PATTERN = new RegExp(`^\\s*(${constants_1.YEAR_PATTERN})`, "i");
|
|
5
|
+
const YEAR_GROUP = 1;
|
|
6
|
+
class ENExtractYearSuffixRefiner {
|
|
7
|
+
refine(context, results) {
|
|
8
|
+
results.forEach(function (result) {
|
|
9
|
+
if (!result.start.isDateWithUnknownYear()) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
const suffix = context.text.substring(result.index + result.text.length);
|
|
13
|
+
const match = YEAR_SUFFIX_PATTERN.exec(suffix);
|
|
14
|
+
if (!match) {
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
context.debug(() => {
|
|
18
|
+
console.log(`Extracting year: '${match[0]}' into : ${result}`);
|
|
19
|
+
});
|
|
20
|
+
const year = constants_1.parseYear(match[YEAR_GROUP]);
|
|
21
|
+
if (result.end != null) {
|
|
22
|
+
result.end.assign("year", year);
|
|
23
|
+
}
|
|
24
|
+
result.start.assign("year", year);
|
|
25
|
+
result.text += match[0];
|
|
26
|
+
});
|
|
27
|
+
return results;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
exports.default = ENExtractYearSuffixRefiner;
|
|
31
|
+
//# sourceMappingURL=ENExtractYearSuffixRefiner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ENExtractYearSuffixRefiner.js","sourceRoot":"","sources":["../../../../../src/locales/en/refiners/ENExtractYearSuffixRefiner.ts"],"names":[],"mappings":";;AAEA,4CAAuD;AAEvD,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,SAAS,wBAAY,GAAG,EAAE,GAAG,CAAC,CAAC;AACtE,MAAM,UAAU,GAAG,CAAC,CAAC;AACrB,MAAqB,0BAA0B;IAC3C,MAAM,CAAC,OAAuB,EAAE,OAAwB;QACpD,OAAO,CAAC,OAAO,CAAC,UAAU,MAAM;YAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE;gBACvC,OAAO;aACV;YAED,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzE,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,CAAC,KAAK,EAAE;gBACR,OAAO;aACV;YAED,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACf,OAAO,CAAC,GAAG,CAAC,qBAAqB,KAAK,CAAC,CAAC,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC;YACnE,CAAC,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,qBAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YAC1C,IAAI,MAAM,CAAC,GAAG,IAAI,IAAI,EAAE;gBACpB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;aACnC;YACD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAClC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AA3BD,6CA2BC"}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const AbstractMergeDateTimeRefiner_1 = __importDefault(require("../../../common/refiners/AbstractMergeDateTimeRefiner"));
|
|
7
7
|
class ENMergeDateTimeRefiner extends AbstractMergeDateTimeRefiner_1.default {
|
|
8
8
|
patternBetween() {
|
|
9
|
-
return new RegExp("^\\s*(T|at|after|before|on|of
|
|
9
|
+
return new RegExp("^\\s*(T|at|after|before|on|of|,|-|\\.|∙|:)?\\s*$");
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
12
|
exports.default = ENMergeDateTimeRefiner;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ENMergeDateTimeRefiner.js","sourceRoot":"","sources":["../../../../../src/locales/en/refiners/ENMergeDateTimeRefiner.ts"],"names":[],"mappings":";;;;;AAAA,yHAAiG;AAQjG,MAAqB,sBAAuB,SAAQ,sCAA4B;IAC5E,cAAc;QACV,OAAO,IAAI,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"ENMergeDateTimeRefiner.js","sourceRoot":"","sources":["../../../../../src/locales/en/refiners/ENMergeDateTimeRefiner.ts"],"names":[],"mappings":";;;;;AAAA,yHAAiG;AAQjG,MAAqB,sBAAuB,SAAQ,sCAA4B;IAC5E,cAAc;QACV,OAAO,IAAI,MAAM,CAAC,kDAAkD,CAAC,CAAC;IAC1E,CAAC;CACJ;AAJD,yCAIC"}
|
|
@@ -1,2 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
import { Chrono, Configuration, Parser, Refiner } from "../../chrono";
|
|
2
|
+
import { ParsingResult, ParsingComponents, ReferenceWithTimezone } from "../../results";
|
|
3
|
+
import { Component, ParsedResult, ParsingOption, ParsingReference, Meridiem, Weekday } from "../../types";
|
|
4
|
+
export * as hant from "./hant";
|
|
2
5
|
export * as hans from "./hans";
|
|
6
|
+
export { Chrono, Parser, Refiner, ParsingResult, ParsingComponents, ReferenceWithTimezone };
|
|
7
|
+
export { Component, ParsedResult, ParsingOption, ParsingReference, Meridiem, Weekday };
|
|
8
|
+
export declare const casual: Chrono;
|
|
9
|
+
export declare const strict: Chrono;
|
|
10
|
+
export declare function parse(text: string, ref?: ParsingReference | Date, option?: ParsingOption): ParsedResult[];
|
|
11
|
+
export declare function parseDate(text: string, ref?: ParsingReference | Date, option?: ParsingOption): Date;
|
|
12
|
+
export declare function createCasualConfiguration(): Configuration;
|
|
13
|
+
export declare function createConfiguration(): Configuration;
|
|
@@ -11,9 +11,6 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
11
11
|
}) : function(o, v) {
|
|
12
12
|
o["default"] = v;
|
|
13
13
|
});
|
|
14
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
15
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
16
|
-
};
|
|
17
14
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
18
15
|
if (mod && mod.__esModule) return mod;
|
|
19
16
|
var result = {};
|
|
@@ -21,8 +18,71 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
21
18
|
__setModuleDefault(result, mod);
|
|
22
19
|
return result;
|
|
23
20
|
};
|
|
21
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
22
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
|
+
};
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
exports.hans = void 0;
|
|
26
|
-
|
|
25
|
+
exports.createConfiguration = exports.createCasualConfiguration = exports.parseDate = exports.parse = exports.strict = exports.casual = exports.Weekday = exports.Meridiem = exports.ReferenceWithTimezone = exports.ParsingComponents = exports.ParsingResult = exports.Chrono = exports.hans = exports.hant = void 0;
|
|
26
|
+
const configurations_1 = require("../../configurations");
|
|
27
|
+
const chrono_1 = require("../../chrono");
|
|
28
|
+
Object.defineProperty(exports, "Chrono", { enumerable: true, get: function () { return chrono_1.Chrono; } });
|
|
29
|
+
const results_1 = require("../../results");
|
|
30
|
+
Object.defineProperty(exports, "ParsingResult", { enumerable: true, get: function () { return results_1.ParsingResult; } });
|
|
31
|
+
Object.defineProperty(exports, "ParsingComponents", { enumerable: true, get: function () { return results_1.ParsingComponents; } });
|
|
32
|
+
Object.defineProperty(exports, "ReferenceWithTimezone", { enumerable: true, get: function () { return results_1.ReferenceWithTimezone; } });
|
|
33
|
+
const types_1 = require("../../types");
|
|
34
|
+
Object.defineProperty(exports, "Meridiem", { enumerable: true, get: function () { return types_1.Meridiem; } });
|
|
35
|
+
Object.defineProperty(exports, "Weekday", { enumerable: true, get: function () { return types_1.Weekday; } });
|
|
36
|
+
const ExtractTimezoneOffsetRefiner_1 = __importDefault(require("../../common/refiners/ExtractTimezoneOffsetRefiner"));
|
|
37
|
+
const ZHHansDateParser_1 = __importDefault(require("./hans/parsers/ZHHansDateParser"));
|
|
38
|
+
const ZHHansDeadlineFormatParser_1 = __importDefault(require("./hans/parsers/ZHHansDeadlineFormatParser"));
|
|
39
|
+
const ZHHansRelationWeekdayParser_1 = __importDefault(require("./hans/parsers/ZHHansRelationWeekdayParser"));
|
|
40
|
+
const ZHHansTimeExpressionParser_1 = __importDefault(require("./hans/parsers/ZHHansTimeExpressionParser"));
|
|
41
|
+
const ZHHansWeekdayParser_1 = __importDefault(require("./hans/parsers/ZHHansWeekdayParser"));
|
|
42
|
+
const ZHHantCasualDateParser_1 = __importDefault(require("./hant/parsers/ZHHantCasualDateParser"));
|
|
43
|
+
const ZHHantDateParser_1 = __importDefault(require("./hant/parsers/ZHHantDateParser"));
|
|
44
|
+
const ZHHantDeadlineFormatParser_1 = __importDefault(require("./hant/parsers/ZHHantDeadlineFormatParser"));
|
|
45
|
+
const ZHHantRelationWeekdayParser_1 = __importDefault(require("./hant/parsers/ZHHantRelationWeekdayParser"));
|
|
46
|
+
const ZHHantTimeExpressionParser_1 = __importDefault(require("./hant/parsers/ZHHantTimeExpressionParser"));
|
|
47
|
+
const ZHHantWeekdayParser_1 = __importDefault(require("./hant/parsers/ZHHantWeekdayParser"));
|
|
48
|
+
const ZHHantMergeDateRangeRefiner_1 = __importDefault(require("./hant/refiners/ZHHantMergeDateRangeRefiner"));
|
|
49
|
+
const ZHHantMergeDateTimeRefiner_1 = __importDefault(require("./hant/refiners/ZHHantMergeDateTimeRefiner"));
|
|
50
|
+
exports.hant = __importStar(require("./hant"));
|
|
27
51
|
exports.hans = __importStar(require("./hans"));
|
|
52
|
+
exports.casual = new chrono_1.Chrono(createCasualConfiguration());
|
|
53
|
+
exports.strict = new chrono_1.Chrono(createConfiguration());
|
|
54
|
+
function parse(text, ref, option) {
|
|
55
|
+
return exports.casual.parse(text, ref, option);
|
|
56
|
+
}
|
|
57
|
+
exports.parse = parse;
|
|
58
|
+
function parseDate(text, ref, option) {
|
|
59
|
+
return exports.casual.parseDate(text, ref, option);
|
|
60
|
+
}
|
|
61
|
+
exports.parseDate = parseDate;
|
|
62
|
+
function createCasualConfiguration() {
|
|
63
|
+
const option = createConfiguration();
|
|
64
|
+
option.parsers.unshift(new ZHHantCasualDateParser_1.default());
|
|
65
|
+
return option;
|
|
66
|
+
}
|
|
67
|
+
exports.createCasualConfiguration = createCasualConfiguration;
|
|
68
|
+
function createConfiguration() {
|
|
69
|
+
const configuration = configurations_1.includeCommonConfiguration({
|
|
70
|
+
parsers: [
|
|
71
|
+
new ZHHantDateParser_1.default(),
|
|
72
|
+
new ZHHansDateParser_1.default(),
|
|
73
|
+
new ZHHantRelationWeekdayParser_1.default(),
|
|
74
|
+
new ZHHansRelationWeekdayParser_1.default(),
|
|
75
|
+
new ZHHantWeekdayParser_1.default(),
|
|
76
|
+
new ZHHansWeekdayParser_1.default(),
|
|
77
|
+
new ZHHantTimeExpressionParser_1.default(),
|
|
78
|
+
new ZHHansTimeExpressionParser_1.default(),
|
|
79
|
+
new ZHHantDeadlineFormatParser_1.default(),
|
|
80
|
+
new ZHHansDeadlineFormatParser_1.default(),
|
|
81
|
+
],
|
|
82
|
+
refiners: [new ZHHantMergeDateRangeRefiner_1.default(), new ZHHantMergeDateTimeRefiner_1.default()],
|
|
83
|
+
});
|
|
84
|
+
configuration.refiners = configuration.refiners.filter((refiner) => !(refiner instanceof ExtractTimezoneOffsetRefiner_1.default));
|
|
85
|
+
return configuration;
|
|
86
|
+
}
|
|
87
|
+
exports.createConfiguration = createConfiguration;
|
|
28
88
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/locales/zh/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/locales/zh/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAkE;AAClE,yCAAsE;AAuB7D,uFAvBA,eAAM,OAuBA;AAtBf,2CAAwF;AAsBtD,8FAtBzB,uBAAa,OAsByB;AAAE,kGAtBzB,2BAAiB,OAsByB;AAAE,sGAtBzB,+BAAqB,OAsByB;AArBzF,uCAA0G;AAsBvC,yFAtBA,gBAAQ,OAsBA;AAAE,wFAtBA,eAAO,OAsBA;AArBpF,sHAA8F;AAG9F,uFAA+D;AAC/D,2GAAmF;AACnF,6GAAqF;AACrF,2GAAmF;AACnF,6FAAqE;AAErE,mGAA2E;AAC3E,uFAA+D;AAC/D,2GAAmF;AACnF,6GAAqF;AACrF,2GAAmF;AACnF,6FAAqE;AACrE,8GAAsF;AACtF,4GAAoF;AAEpF,+CAA+B;AAC/B,+CAA+B;AAIlB,QAAA,MAAM,GAAG,IAAI,eAAM,CAAC,yBAAyB,EAAE,CAAC,CAAC;AACjD,QAAA,MAAM,GAAG,IAAI,eAAM,CAAC,mBAAmB,EAAE,CAAC,CAAC;AAExD,SAAgB,KAAK,CAAC,IAAY,EAAE,GAA6B,EAAE,MAAsB;IACrF,OAAO,cAAM,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC3C,CAAC;AAFD,sBAEC;AAED,SAAgB,SAAS,CAAC,IAAY,EAAE,GAA6B,EAAE,MAAsB;IACzF,OAAO,cAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAFD,8BAEC;AAKD,SAAgB,yBAAyB;IACrC,MAAM,MAAM,GAAG,mBAAmB,EAAE,CAAC;IACrC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,gCAAsB,EAAE,CAAC,CAAC;IACrD,OAAO,MAAM,CAAC;AAClB,CAAC;AAJD,8DAIC;AAKD,SAAgB,mBAAmB;IAC/B,MAAM,aAAa,GAAG,2CAA0B,CAAC;QAC7C,OAAO,EAAE;YACL,IAAI,0BAAgB,EAAE;YACtB,IAAI,0BAAgB,EAAE;YACtB,IAAI,qCAA2B,EAAE;YACjC,IAAI,qCAA2B,EAAE;YACjC,IAAI,6BAAmB,EAAE;YACzB,IAAI,6BAAmB,EAAE;YACzB,IAAI,oCAA0B,EAAE;YAChC,IAAI,oCAA0B,EAAE;YAChC,IAAI,oCAA0B,EAAE;YAChC,IAAI,oCAA0B,EAAE;SACnC;QACD,QAAQ,EAAE,CAAC,IAAI,qCAA2B,EAAE,EAAE,IAAI,oCAA0B,EAAE,CAAC;KAClF,CAAC,CAAC;IAGH,aAAa,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,CAClD,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,YAAY,sCAA4B,CAAC,CAClE,CAAC;IAEF,OAAO,aAAa,CAAC;AACzB,CAAC;AAvBD,kDAuBC"}
|
package/dist/cjs/results.js
CHANGED
|
@@ -102,7 +102,7 @@ class ParsingComponents {
|
|
|
102
102
|
return !this.isCertain("hour") && !this.isCertain("minute") && !this.isCertain("second");
|
|
103
103
|
}
|
|
104
104
|
isOnlyTime() {
|
|
105
|
-
return !this.isCertain("weekday") && !this.isCertain("day") && !this.isCertain("month");
|
|
105
|
+
return (!this.isCertain("weekday") && !this.isCertain("day") && !this.isCertain("month") && !this.isCertain("year"));
|
|
106
106
|
}
|
|
107
107
|
isOnlyWeekdayComponent() {
|
|
108
108
|
return this.isCertain("weekday") && !this.isCertain("day") && !this.isCertain("month");
|
|
@@ -180,10 +180,13 @@ class ParsingComponents {
|
|
|
180
180
|
components.assign("month", date.month() + 1);
|
|
181
181
|
components.assign("year", date.year());
|
|
182
182
|
}
|
|
183
|
+
else if (fragments["week"]) {
|
|
184
|
+
components.assign("day", date.date());
|
|
185
|
+
components.assign("month", date.month() + 1);
|
|
186
|
+
components.assign("year", date.year());
|
|
187
|
+
components.imply("weekday", date.day());
|
|
188
|
+
}
|
|
183
189
|
else {
|
|
184
|
-
if (fragments["week"]) {
|
|
185
|
-
components.imply("weekday", date.day());
|
|
186
|
-
}
|
|
187
190
|
components.imply("day", date.date());
|
|
188
191
|
if (fragments["month"]) {
|
|
189
192
|
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":"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
|
|
1
|
+
{"version":3,"file":"results.js","sourceRoot":"","sources":["../../src/results.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,6 +62,10 @@ export class AbstractTimeExpressionParser {
|
|
|
62
62
|
extract(context, match) {
|
|
63
63
|
const startComponents = this.extractPrimaryTimeComponents(context, match);
|
|
64
64
|
if (!startComponents) {
|
|
65
|
+
if (match[0].match(/^\d{4}/)) {
|
|
66
|
+
match.index += 4;
|
|
67
|
+
return null;
|
|
68
|
+
}
|
|
65
69
|
match.index += match[0].length;
|
|
66
70
|
return null;
|
|
67
71
|
}
|
|
@@ -72,8 +76,13 @@ export class AbstractTimeExpressionParser {
|
|
|
72
76
|
const remainingText = context.text.substring(match.index);
|
|
73
77
|
const followingPattern = this.getFollowingTimePatternThroughCache();
|
|
74
78
|
const followingMatch = followingPattern.exec(remainingText);
|
|
75
|
-
if (text.match(/^\d{3,4}/) && followingMatch
|
|
76
|
-
|
|
79
|
+
if (text.match(/^\d{3,4}/) && followingMatch) {
|
|
80
|
+
if (followingMatch[0].match(/^\s*([+-])\s*\d{2,4}$/)) {
|
|
81
|
+
return null;
|
|
82
|
+
}
|
|
83
|
+
if (followingMatch[0].match(/^\s*([+-])\s*\d{2}\W\d{2}/)) {
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
77
86
|
}
|
|
78
87
|
if (!followingMatch ||
|
|
79
88
|
followingMatch[0].match(/^\s*([+-])\s*\d{3,4}$/)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractTimeExpressionParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/AbstractTimeExpressionParser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AbstractTimeExpressionParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/AbstractTimeExpressionParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,16 +2,5 @@ import { ParsingContext } from "../../chrono.js";
|
|
|
2
2
|
import { AbstractParserWithWordBoundaryChecking } from "./AbstractParserWithWordBoundary.js";
|
|
3
3
|
export default class ISOFormatParser extends AbstractParserWithWordBoundaryChecking {
|
|
4
4
|
innerPattern(): RegExp;
|
|
5
|
-
innerExtract(context: ParsingContext, match: RegExpMatchArray):
|
|
6
|
-
day?: number;
|
|
7
|
-
hour?: number;
|
|
8
|
-
minute?: number;
|
|
9
|
-
month?: number;
|
|
10
|
-
second?: number;
|
|
11
|
-
weekday?: number;
|
|
12
|
-
year?: number;
|
|
13
|
-
millisecond?: number;
|
|
14
|
-
meridiem?: number;
|
|
15
|
-
timezoneOffset?: number;
|
|
16
|
-
};
|
|
5
|
+
innerExtract(context: ParsingContext, match: RegExpMatchArray): import("../../index.js").ParsingComponents;
|
|
17
6
|
}
|
|
@@ -5,7 +5,7 @@ const PATTERN = new RegExp("([0-9]{4})\\-([0-9]{1,2})\\-([0-9]{1,2})" +
|
|
|
5
5
|
"(?:" +
|
|
6
6
|
":([0-9]{1,2})(?:\\.(\\d{1,4}))?" +
|
|
7
7
|
")?" +
|
|
8
|
-
"(
|
|
8
|
+
"(" +
|
|
9
9
|
"Z|([+-]\\d{2}):?(\\d{2})?" +
|
|
10
10
|
")?" +
|
|
11
11
|
")?" +
|
|
@@ -17,46 +17,48 @@ const HOUR_NUMBER_GROUP = 4;
|
|
|
17
17
|
const MINUTE_NUMBER_GROUP = 5;
|
|
18
18
|
const SECOND_NUMBER_GROUP = 6;
|
|
19
19
|
const MILLISECOND_NUMBER_GROUP = 7;
|
|
20
|
-
const
|
|
21
|
-
const
|
|
20
|
+
const TZD_GROUP = 8;
|
|
21
|
+
const TZD_HOUR_OFFSET_GROUP = 9;
|
|
22
|
+
const TZD_MINUTE_OFFSET_GROUP = 10;
|
|
22
23
|
export default class ISOFormatParser extends AbstractParserWithWordBoundaryChecking {
|
|
23
24
|
innerPattern() {
|
|
24
25
|
return PATTERN;
|
|
25
26
|
}
|
|
26
27
|
innerExtract(context, match) {
|
|
27
|
-
const components = {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
const components = context.createParsingComponents({
|
|
29
|
+
"year": parseInt(match[YEAR_NUMBER_GROUP]),
|
|
30
|
+
"month": parseInt(match[MONTH_NUMBER_GROUP]),
|
|
31
|
+
"day": parseInt(match[DATE_NUMBER_GROUP]),
|
|
32
|
+
});
|
|
31
33
|
if (match[HOUR_NUMBER_GROUP] != null) {
|
|
32
|
-
components
|
|
33
|
-
components
|
|
34
|
+
components.assign("hour", parseInt(match[HOUR_NUMBER_GROUP]));
|
|
35
|
+
components.assign("minute", parseInt(match[MINUTE_NUMBER_GROUP]));
|
|
34
36
|
if (match[SECOND_NUMBER_GROUP] != null) {
|
|
35
|
-
components
|
|
37
|
+
components.assign("second", parseInt(match[SECOND_NUMBER_GROUP]));
|
|
36
38
|
}
|
|
37
39
|
if (match[MILLISECOND_NUMBER_GROUP] != null) {
|
|
38
|
-
components
|
|
39
|
-
}
|
|
40
|
-
if (match[TZD_HOUR_OFFSET_GROUP] == null) {
|
|
41
|
-
components["timezoneOffset"] = 0;
|
|
40
|
+
components.assign("millisecond", parseInt(match[MILLISECOND_NUMBER_GROUP]));
|
|
42
41
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
minuteOffset =
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
offset
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
42
|
+
if (match[TZD_GROUP] != null) {
|
|
43
|
+
let offset = 0;
|
|
44
|
+
if (match[TZD_HOUR_OFFSET_GROUP]) {
|
|
45
|
+
const hourOffset = parseInt(match[TZD_HOUR_OFFSET_GROUP]);
|
|
46
|
+
let minuteOffset = 0;
|
|
47
|
+
if (match[TZD_MINUTE_OFFSET_GROUP] != null) {
|
|
48
|
+
minuteOffset = parseInt(match[TZD_MINUTE_OFFSET_GROUP]);
|
|
49
|
+
}
|
|
50
|
+
offset = hourOffset * 60;
|
|
51
|
+
if (offset < 0) {
|
|
52
|
+
offset -= minuteOffset;
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
offset += minuteOffset;
|
|
56
|
+
}
|
|
55
57
|
}
|
|
56
|
-
components
|
|
58
|
+
components.assign("timezoneOffset", offset);
|
|
57
59
|
}
|
|
58
60
|
}
|
|
59
|
-
return components;
|
|
61
|
+
return components.addTag("parser/ISOFormatParser");
|
|
60
62
|
}
|
|
61
63
|
}
|
|
62
64
|
//# sourceMappingURL=ISOFormatParser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ISOFormatParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/ISOFormatParser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sCAAsC,EAAE,MAAM,kCAAkC,CAAC;AAW1F,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,0CAA0C;IAC1C,MAAM;IACF,2BAA2B;IAC3B,KAAK;IACD,iCAAiC;IACrC,IAAI;IACJ,
|
|
1
|
+
{"version":3,"file":"ISOFormatParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/ISOFormatParser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sCAAsC,EAAE,MAAM,kCAAkC,CAAC;AAW1F,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,0CAA0C;IAC1C,MAAM;IACF,2BAA2B;IAC3B,KAAK;IACD,iCAAiC;IACrC,IAAI;IACJ,GAAG;IACC,2BAA2B;IAC/B,IAAI;IACR,IAAI;IACJ,WAAW,EACX,GAAG,CACN,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,wBAAwB,GAAG,CAAC,CAAC;AACnC,MAAM,SAAS,GAAG,CAAC,CAAC;AACpB,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAChC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAEnC,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,sCAAsC;IAC/E,YAAY;QACR,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAAuB,EAAE,KAAuB;QACzD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC;YAC/C,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAC1C,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC5C,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;SAC5C,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,iBAAiB,CAAC,IAAI,IAAI,EAAE;YAClC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAC9D,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;YAElE,IAAI,KAAK,CAAC,mBAAmB,CAAC,IAAI,IAAI,EAAE;gBACpC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;aACrE;YAED,IAAI,KAAK,CAAC,wBAAwB,CAAC,IAAI,IAAI,EAAE;gBACzC,UAAU,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;aAC/E;YACD,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,IAAI,EAAE;gBAE1B,IAAI,MAAM,GAAG,CAAC,CAAC;gBACf,IAAI,KAAK,CAAC,qBAAqB,CAAC,EAAE;oBAC9B,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;oBAC1D,IAAI,YAAY,GAAG,CAAC,CAAC;oBACrB,IAAI,KAAK,CAAC,uBAAuB,CAAC,IAAI,IAAI,EAAE;wBACxC,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC;qBAC3D;oBACD,MAAM,GAAG,UAAU,GAAG,EAAE,CAAC;oBACzB,IAAI,MAAM,GAAG,CAAC,EAAE;wBACZ,MAAM,IAAI,YAAY,CAAC;qBAC1B;yBAAM;wBACH,MAAM,IAAI,YAAY,CAAC;qBAC1B;iBACJ;gBACD,UAAU,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;aAC/C;SACJ;QACD,OAAO,UAAU,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;IACvD,CAAC;CACJ"}
|
|
@@ -17,18 +17,25 @@ export default class SlashDateFormatParser {
|
|
|
17
17
|
return PATTERN;
|
|
18
18
|
}
|
|
19
19
|
extract(context, match) {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
const index = match.index + match[OPENING_GROUP].length;
|
|
21
|
+
const indexEnd = match.index + match[0].length - match[ENDING_GROUP].length;
|
|
22
|
+
if (index > 0) {
|
|
23
|
+
const textBefore = context.text.substring(0, index);
|
|
24
|
+
if (textBefore.match("\\d/?$")) {
|
|
23
25
|
return;
|
|
24
26
|
}
|
|
25
27
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
+
if (indexEnd < context.text.length) {
|
|
29
|
+
const textAfter = context.text.substring(indexEnd);
|
|
30
|
+
if (textAfter.match("^/?\\d")) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
const text = context.text.substring(index, indexEnd);
|
|
28
35
|
if (text.match(/^\d\.\d$/) || text.match(/^\d\.\d{1,2}\.\d{1,2}\s*$/)) {
|
|
29
36
|
return;
|
|
30
37
|
}
|
|
31
|
-
if (!match[YEAR_GROUP] &&
|
|
38
|
+
if (!match[YEAR_GROUP] && text.indexOf("/") < 0) {
|
|
32
39
|
return;
|
|
33
40
|
}
|
|
34
41
|
const result = context.createParsingResult(index, text);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SlashDateFormatParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/SlashDateFormatParser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AASrF,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,YAAY;IACR,qDAAqD;IACrD,qCAAqC;IACrC,SAAS,EACb,GAAG,CACN,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,YAAY,GAAG,CAAC,CAAC;AAEvB,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAE/B,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAItC,YAAY,YAAqB;QAC7B,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,mBAAmB,CAAC;QAClF,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,oBAAoB,CAAC;IACpF,CAAC;IAED,OAAO;QACH,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,OAAO,CAAC,OAAuB,EAAE,KAAuB;QAGpD,
|
|
1
|
+
{"version":3,"file":"SlashDateFormatParser.js","sourceRoot":"","sources":["../../../../src/common/parsers/SlashDateFormatParser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AASrF,MAAM,OAAO,GAAG,IAAI,MAAM,CACtB,YAAY;IACR,qDAAqD;IACrD,qCAAqC;IACrC,SAAS,EACb,GAAG,CACN,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,YAAY,GAAG,CAAC,CAAC;AAEvB,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAE/B,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAItC,YAAY,YAAqB;QAC7B,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,mBAAmB,CAAC;QAClF,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,oBAAoB,CAAC;IACpF,CAAC;IAED,OAAO;QACH,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,OAAO,CAAC,OAAuB,EAAE,KAAuB;QAGpD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC;QACxD,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC;QAC5E,IAAI,KAAK,GAAG,CAAC,EAAE;YACX,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;YACpD,IAAI,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;gBAC5B,OAAO;aACV;SACJ;QACD,IAAI,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE;YAChC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACnD,IAAI,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;gBAC3B,OAAO;aACV;SACJ;QAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAGrD,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,EAAE;YACnE,OAAO;SACV;QAID,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC7C,OAAO;SACV;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACxD,IAAI,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACnD,IAAI,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;QAC/C,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE,EAAE;YACzB,IAAI,KAAK,GAAG,EAAE,EAAE;gBACZ,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,EAAE,IAAI,KAAK,IAAI,EAAE,EAAE;oBACtC,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;iBAC/B;qBAAM;oBACH,OAAO,IAAI,CAAC;iBACf;aACJ;SACJ;QAED,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC;SACf;QAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAChC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAEpC,IAAI,KAAK,CAAC,UAAU,CAAC,EAAE;YACnB,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YAClD,MAAM,IAAI,GAAG,oBAAoB,CAAC,aAAa,CAAC,CAAC;YACjD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACrC;aAAM;YACH,MAAM,IAAI,GAAG,oBAAoB,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;YAC/D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACpC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
|
|
@@ -5,7 +5,7 @@ export default class ForwardDateRefiner {
|
|
|
5
5
|
if (!context.option.forwardDate) {
|
|
6
6
|
return results;
|
|
7
7
|
}
|
|
8
|
-
results.forEach(
|
|
8
|
+
results.forEach((result) => {
|
|
9
9
|
let refMoment = dayjs(context.refDate);
|
|
10
10
|
if (result.start.isOnlyTime() && refMoment.isAfter(result.start.dayjs())) {
|
|
11
11
|
refMoment = refMoment.add(1, "day");
|
|
@@ -17,6 +17,9 @@ export default class ForwardDateRefiner {
|
|
|
17
17
|
implySimilarDate(result.end, refMoment);
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
+
context.debug(() => {
|
|
21
|
+
console.log(`${this.constructor.name} adjusted ${result} time result (${result.start})`);
|
|
22
|
+
});
|
|
20
23
|
}
|
|
21
24
|
if (result.start.isOnlyWeekdayComponent() && refMoment.isAfter(result.start.dayjs())) {
|
|
22
25
|
if (refMoment.day() >= result.start.get("weekday")) {
|
|
@@ -29,7 +32,7 @@ export default class ForwardDateRefiner {
|
|
|
29
32
|
result.start.imply("month", refMoment.month() + 1);
|
|
30
33
|
result.start.imply("year", refMoment.year());
|
|
31
34
|
context.debug(() => {
|
|
32
|
-
console.log(
|
|
35
|
+
console.log(`${this.constructor.name} adjusted ${result} weekday (${result.start})`);
|
|
33
36
|
});
|
|
34
37
|
if (result.end && result.end.isOnlyWeekdayComponent()) {
|
|
35
38
|
if (refMoment.day() > result.end.get("weekday")) {
|
|
@@ -42,7 +45,7 @@ export default class ForwardDateRefiner {
|
|
|
42
45
|
result.end.imply("month", refMoment.month() + 1);
|
|
43
46
|
result.end.imply("year", refMoment.year());
|
|
44
47
|
context.debug(() => {
|
|
45
|
-
console.log(
|
|
48
|
+
console.log(`${this.constructor.name} adjusted ${result} weekday (${result.end})`);
|
|
46
49
|
});
|
|
47
50
|
}
|
|
48
51
|
}
|
|
@@ -50,12 +53,12 @@ export default class ForwardDateRefiner {
|
|
|
50
53
|
for (let i = 0; i < 3 && refMoment.isAfter(result.start.dayjs()); i++) {
|
|
51
54
|
result.start.imply("year", result.start.get("year") + 1);
|
|
52
55
|
context.debug(() => {
|
|
53
|
-
console.log(
|
|
56
|
+
console.log(`${this.constructor.name} adjusted ${result} year (${result.start})`);
|
|
54
57
|
});
|
|
55
58
|
if (result.end && !result.end.isCertain("year")) {
|
|
56
59
|
result.end.imply("year", result.end.get("year") + 1);
|
|
57
60
|
context.debug(() => {
|
|
58
|
-
console.log(
|
|
61
|
+
console.log(`${this.constructor.name} adjusted ${result} month (${result.start})`);
|
|
59
62
|
});
|
|
60
63
|
}
|
|
61
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ForwardDateRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ForwardDateRefiner.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,CAAC,OAAO,OAAO,kBAAkB;IACnC,MAAM,CAAC,OAAuB,EAAE,OAAwB;QACpD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE;YAC7B,OAAO,OAAO,CAAC;SAClB;QAED,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"ForwardDateRefiner.js","sourceRoot":"","sources":["../../../../src/common/refiners/ForwardDateRefiner.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import ENTimeUnitWithinFormatParser from "./parsers/ENTimeUnitWithinFormatParser
|
|
|
2
2
|
import ENMonthNameLittleEndianParser from "./parsers/ENMonthNameLittleEndianParser.js";
|
|
3
3
|
import ENMonthNameMiddleEndianParser from "./parsers/ENMonthNameMiddleEndianParser.js";
|
|
4
4
|
import ENMonthNameParser from "./parsers/ENMonthNameParser.js";
|
|
5
|
-
import
|
|
5
|
+
import ENYearMonthDayParser from "./parsers/ENYearMonthDayParser.js";
|
|
6
6
|
import ENSlashMonthFormatParser from "./parsers/ENSlashMonthFormatParser.js";
|
|
7
7
|
import ENTimeExpressionParser from "./parsers/ENTimeExpressionParser.js";
|
|
8
8
|
import ENTimeUnitAgoFormatParser from "./parsers/ENTimeUnitAgoFormatParser.js";
|
|
@@ -19,6 +19,7 @@ import ENTimeUnitCasualRelativeFormatParser from "./parsers/ENTimeUnitCasualRela
|
|
|
19
19
|
import ENMergeRelativeAfterDateRefiner from "./refiners/ENMergeRelativeAfterDateRefiner.js";
|
|
20
20
|
import ENMergeRelativeFollowByDateRefiner from "./refiners/ENMergeRelativeFollowByDateRefiner.js";
|
|
21
21
|
import OverlapRemovalRefiner from "../../common/refiners/OverlapRemovalRefiner.js";
|
|
22
|
+
import ENExtractYearSuffixRefiner from "./refiners/ENExtractYearSuffixRefiner.js";
|
|
22
23
|
export default class ENDefaultConfiguration {
|
|
23
24
|
createCasualConfiguration(littleEndian = false) {
|
|
24
25
|
const option = this.createConfiguration(false, littleEndian);
|
|
@@ -37,7 +38,6 @@ export default class ENDefaultConfiguration {
|
|
|
37
38
|
new ENMonthNameLittleEndianParser(),
|
|
38
39
|
new ENMonthNameMiddleEndianParser(littleEndian),
|
|
39
40
|
new ENWeekdayParser(),
|
|
40
|
-
new ENCasualYearMonthDayParser(),
|
|
41
41
|
new ENSlashMonthFormatParser(),
|
|
42
42
|
new ENTimeExpressionParser(strictMode),
|
|
43
43
|
new ENTimeUnitAgoFormatParser(strictMode),
|
|
@@ -45,10 +45,12 @@ export default class ENDefaultConfiguration {
|
|
|
45
45
|
],
|
|
46
46
|
refiners: [new ENMergeDateTimeRefiner()],
|
|
47
47
|
}, strictMode);
|
|
48
|
+
options.parsers.unshift(new ENYearMonthDayParser(strictMode));
|
|
48
49
|
options.refiners.unshift(new ENMergeRelativeFollowByDateRefiner());
|
|
49
50
|
options.refiners.unshift(new ENMergeRelativeAfterDateRefiner());
|
|
50
51
|
options.refiners.unshift(new OverlapRemovalRefiner());
|
|
51
52
|
options.refiners.push(new ENMergeDateTimeRefiner());
|
|
53
|
+
options.refiners.push(new ENExtractYearSuffixRefiner());
|
|
52
54
|
options.refiners.push(new ENMergeDateRangeRefiner());
|
|
53
55
|
return options;
|
|
54
56
|
}
|