chrono-node 2.3.7 → 2.4.1

package/test/ru/ru_relative.test.ts

@@ -0,0 +1,74 @@
+import * as chrono from "../../src";
+import { testSingleCase } from "../test_util";
+
+test("Test - 'This' expressions", () => {
+    testSingleCase(chrono.ru, "на этой неделе", new Date(2017, 11 - 1, 19, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2017, 11 - 1, 19, 12));
+    });
+
+    testSingleCase(chrono.ru, "в этом месяце", new Date(2017, 11 - 1, 19, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2017, 11 - 1, 1, 12));
+    });
+
+    testSingleCase(chrono.ru, "в этом месяце", new Date(2017, 11 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2017, 11 - 1, 1, 12));
+    });
+
+    testSingleCase(chrono.ru, "в этом году", new Date(2017, 11 - 1, 19, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2017, 1 - 1, 1, 12));
+    });
+});
+
+test("Test - Past relative expressions", () => {
+    testSingleCase(chrono.ru, "на прошлой неделе", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 9 - 1, 24, 12));
+    });
+
+    testSingleCase(chrono.ru, "в прошлом месяце", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 9 - 1, 1, 12));
+    });
+
+    testSingleCase(chrono.ru, "в прошлом году", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2015, 10 - 1, 1, 12));
+    });
+});
+
+test("Test - Future relative expressions", () => {
+    testSingleCase(chrono.ru, "на следующей неделе", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 8, 12));
+    });
+
+    testSingleCase(chrono.ru, "в следующем месяце", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 11 - 1, 1, 12));
+    });
+
+    testSingleCase(chrono.ru, "в следующем квартале", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2017, 1 - 1, 1, 12));
+    });
+
+    testSingleCase(chrono.ru, "в следующем году", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2017, 10 - 1, 1, 12));
+    });
+});

package/test/ru/ru_time_exp.test.ts

@@ -0,0 +1,111 @@
+import * as chrono from "../../src";
+import { testSingleCase, testUnexpectedResult } from "../test_util";
+
+test("Test - Time expression", function () {
+    testSingleCase(chrono.ru, "20:32:13", new Date(2016, 10 - 1, 1, 8), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 1, 20, 32, 13));
+    });
+});
+
+test("Test - Time range expression", function () {
+    testSingleCase(chrono.ru, "10:00:00 - 21:45:01", new Date(2016, 10 - 1, 1, 8), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 1, 10));
+        expect(result.end).toBeDate(new Date(2016, 10 - 1, 1, 21, 45, 1));
+    });
+});
+
+test("Test - Casual time number expression", function () {
+    testSingleCase(chrono.ru, "в 11 утра", new Date(2016, 10 - 1, 1, 8), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 1, 11));
+    });
+
+    testSingleCase(chrono.ru, "в 11 вечера", new Date(2016, 10 - 1, 1, 8), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 1, 23));
+    });
+});
+
+test("Test - Time range's meridiem handling", function () {
+    testSingleCase(chrono.ru, "с 10 до 11 утра", new Date(2016, 10 - 1, 1, 8), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 1, 10));
+        expect(result.end).toBeDate(new Date(2016, 10 - 1, 1, 11));
+    });
+    testSingleCase(chrono.ru, "с 10 до 11 вечера", new Date(2016, 10 - 1, 1, 8), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 1, 22));
+        expect(result.end).toBeDate(new Date(2016, 10 - 1, 1, 23));
+    });
+});
+
+test("Test - Parsing causal positive cases", function () {
+    testSingleCase(chrono.ru.casual, "в 1", (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("в 1");
+        expect(result.start.get("hour")).toBe(1);
+    });
+
+    testSingleCase(chrono.ru.casual, "в 12", (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("в 12");
+        expect(result.start.get("hour")).toBe(12);
+    });
+
+    testSingleCase(chrono.ru.casual, "в 12.30", (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("в 12.30");
+        expect(result.start.get("hour")).toBe(12);
+        expect(result.start.get("minute")).toBe(30);
+    });
+});
+
+test("Test - Parsing negative cases : [year-like] pattern", function () {
+    testUnexpectedResult(chrono.ru, "2020");
+
+    testUnexpectedResult(chrono.ru, "2020  ");
+});
+
+test("Test - Parsing negative cases : 'at [some numbers]'", function () {
+    testUnexpectedResult(chrono.ru, "Температура 101,194 градусов!");
+
+    testUnexpectedResult(chrono.ru, "Температура 101 градусов!");
+
+    testUnexpectedResult(chrono.ru, "Температура 10.1");
+});
+
+test("Test - Parsing negative cases : 'at [some numbers] - [some numbers]'", function () {
+    testUnexpectedResult(chrono.ru, "Это в 10.1 - 10.12");
+
+    testUnexpectedResult(chrono.ru, "Это в 10 - 10.1");
+});
+
+test("Test - Parsing negative cases (Strict)", function () {
+    testUnexpectedResult(chrono.ru.strict, "Это в 101,194 телефон!");
+
+    testUnexpectedResult(chrono.ru.strict, "Это в 101 стул!");
+
+    testUnexpectedResult(chrono.ru.strict, "Это в 10.1");
+
+    testUnexpectedResult(chrono.ru.strict, "Это в 10");
+
+    testUnexpectedResult(chrono.ru.strict, "2020");
+});
+
+test("Test - Parsing negative cases : 'at [some numbers] - [some numbers]' (Strict)", function () {
+    testUnexpectedResult(chrono.ru.strict, "Это в 10.1 - 10.12");
+
+    testUnexpectedResult(chrono.ru.strict, "Это в 10 - 10.1");
+
+    testUnexpectedResult(chrono.ru.strict, "Это в 10 - 20");
+
+    testUnexpectedResult(chrono.ru.strict, "7-730");
+});

package/test/ru/ru_time_units_ago.test.ts

@@ -0,0 +1,48 @@
+import * as chrono from "../../src/";
+import { testSingleCase, testUnexpectedResult } from "../test_util";
+
+test("Test - Single Expression", function () {
+    testSingleCase(chrono.ru, "5 дней назад что-то было", new Date(2012, 7 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("5 дней назад");
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 5));
+    });
+
+    testSingleCase(chrono.ru, "5 минут назад что-то было", new Date(2012, 7 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("5 минут назад");
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 9, 23, 55));
+    });
+
+    testSingleCase(chrono.ru, "полчаса назад что-то было", new Date(2012, 7 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("полчаса назад");
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 9, 23, 30));
+    });
+});
+
+test("Test - Nested time ago", function () {
+    testSingleCase(chrono.ru, "5 дней 2 часа назад что-то было", new Date(2012, 7 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("5 дней 2 часа назад");
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 4, 22));
+    });
+
+    testSingleCase(chrono.ru, "5 минут 20 секунд назад что-то было", new Date(2012, 7 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("5 минут 20 секунд назад");
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 9, 23, 54, 40));
+    });
+
+    testSingleCase(chrono.ru, "2 часа 5 минут назад что-то было", new Date(2012, 7 - 1, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("2 часа 5 минут назад");
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 9, 21, 55));
+    });
+});
+
+test("Test - Negative cases", function () {
+    testUnexpectedResult(chrono.ru, "15 часов 29 мин");
+    testUnexpectedResult(chrono.ru, "несколько часов");
+    testUnexpectedResult(chrono.ru, "5 дней");
+});

package/test/ru/ru_time_units_casual_relative.test.ts

@@ -0,0 +1,112 @@
+import * as chrono from "../../src";
+import { testSingleCase } from "../test_util";
+
+test("Test - Positive time units", () => {
+    testSingleCase(chrono.ru, "следующие 2 недели", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 15, 12));
+    });
+
+    testSingleCase(chrono.ru, "следующие 2 дня", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 3, 12));
+    });
+
+    testSingleCase(chrono.ru, "следующие два года", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2018, 10 - 1, 1, 12));
+    });
+
+    testSingleCase(chrono.ru, "следующие 2 недели 3 дня", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 18, 12));
+    });
+
+    testSingleCase(chrono.ru, "через пару минут", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 1, 12, 2));
+    });
+
+    testSingleCase(chrono.ru, "через полчаса", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 1, 12, 30));
+    });
+
+    testSingleCase(chrono.ru, "через 2 часа", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 1, 14));
+    });
+
+    testSingleCase(chrono.ru, "через три месяца", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2017, 1 - 1, 1, 12));
+    });
+
+    testSingleCase(chrono.ru, "через неделю", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 10 - 1, 8, 12));
+    });
+
+    testSingleCase(chrono.ru, "через месяц", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 11 - 1, 1, 12));
+    });
+
+    testSingleCase(chrono.ru, "через год", new Date(2020, 11 - 1, 22, 12, 11, 32, 6), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2021, 11 - 1, 22, 12, 11, 32, 6));
+    });
+});
+
+test("Test - Negative time units", () => {
+    testSingleCase(chrono.ru, "прошлые 2 недели", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 9 - 1, 17, 12));
+    });
+
+    testSingleCase(chrono.ru, "прошлые два дня", new Date(2016, 10 - 1, 1, 12), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2016, 9 - 1, 29, 12));
+    });
+});
+
+test("Test - Plus '+' sign", () => {
+    testSingleCase(chrono.ru.casual, "+15 минут", new Date(2012, 7 - 1, 10, 12, 14), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 10, 12, 29));
+    });
+
+    testSingleCase(chrono.ru.casual, "+15мин", new Date(2012, 7 - 1, 10, 12, 14), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 10, 12, 29));
+    });
+
+    testSingleCase(chrono.ru.casual, "+1 день 2 часа", new Date(2012, 7 - 1, 10, 12, 14), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 11, 14, 14));
+    });
+});
+
+test("Test - Minus '-' sign", () => {
+    testSingleCase(chrono.ru.casual, "-3 года", new Date(2015, 7 - 1, 10, 12, 14), (result, text) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe(text);
+        expect(result.start).toBeDate(new Date(2012, 7 - 1, 10, 12, 14));
+    });
+});

package/test/ru/ru_time_units_within.test.ts

@@ -0,0 +1,16 @@
+import * as chrono from "../../src";
+import { testSingleCase } from "../test_util";
+
+test("Test - The normal within expression", () => {
+    testSingleCase(chrono.ru, "будет сделано в течение минуты", new Date(2012, 7, 10), (result) => {
+        expect(result.index).toBe(14);
+        expect(result.text).toBe("в течение минуты");
+        expect(result.start).toBeDate(new Date(2012, 7, 10, 0, 1));
+    });
+
+    testSingleCase(chrono.ru, "будет сделано в течение 2 часов.", new Date(2012, 7, 10), (result) => {
+        expect(result.index).toBe(14);
+        expect(result.text).toBe("в течение 2 часов");
+        expect(result.start).toBeDate(new Date(2012, 7, 10, 2));
+    });
+});

package/test/ru/ru_weekday.test.ts

@@ -0,0 +1,52 @@
+import * as chrono from "../../src";
+import { testSingleCase } from "../test_util";
+
+test("Test - Single Expression", function () {
+    testSingleCase(chrono.ru.casual, "понедельник", new Date(2012, 7, 9), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("понедельник");
+        expect(result.start).toBeDate(new Date(2012, 7, 6, 12));
+    });
+
+    testSingleCase(chrono.ru.casual, "Дедлайн в пятницу...", new Date(2012, 7, 9), (result) => {
+        expect(result.index).toBe(8);
+        expect(result.text).toBe("в пятницу");
+        expect(result.start).toBeDate(new Date(2012, 7, 10, 12));
+    });
+
+    testSingleCase(chrono.ru.casual, "Дедлайн в прошлый четверг!", new Date(2012, 7, 9), (result) => {
+        expect(result.index).toBe(8);
+        expect(result.text).toBe("в прошлый четверг");
+        expect(result.start).toBeDate(new Date(2012, 7, 2, 12));
+    });
+
+    testSingleCase(chrono.ru.casual, "Дедлайн в следующий вторник", new Date(2015, 3, 18), (result) => {
+        expect(result.index).toBe(8);
+        expect(result.text).toBe("в следующий вторник");
+        expect(result.start).toBeDate(new Date(2015, 3, 21, 12));
+    });
+});
+
+test("Test - Weekday With Casual Time", function () {
+    testSingleCase(chrono.ru.casual, "Позвони в среду утром", new Date(2015, 3, 18), (result) => {
+        expect(result.index).toBe(8);
+        expect(result.text).toBe("в среду утром");
+        expect(result.start).toBeDate(new Date(2015, 3, 15, 6));
+    });
+});
+
+test("Test - Weekday Overlap", function () {
+    testSingleCase(chrono.ru.casual, "воскресенье, 7 декабря 2014", new Date(2012, 7, 9), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("воскресенье, 7 декабря 2014");
+        expect(result.start).toBeDate(new Date(2014, 12 - 1, 7, 12));
+    });
+});
+
+test("Test - forward dates only option", () => {
+    testSingleCase(chrono.ru.casual, "В понедельник?", new Date(2012, 7, 9), { forwardDate: true }, (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("В понедельник");
+        expect(result.start).toBeDate(new Date(2012, 7, 13, 12));
+    });
+});

package/test/system_timezone.test.ts

@@ -16,6 +16,28 @@ test("Test - Timezone difference on reference example", function () {
     );
 });
 
+test("Test - Timezone difference on default timezone", function () {
+    const INPUT = "Friday at 4pm";
+    const REF_INSTANT = new Date(2021, 6 - 1, 9, 7, 0, 0);
+    const EXPECTED_INSTANT = new Date(2021, 6 - 1, 11, 16, 0, 0);
+
+    testSingleCase(chrono, INPUT, REF_INSTANT, (result) => {
+        expect(result).toBeDate(EXPECTED_INSTANT);
+    });
+
+    testSingleCase(chrono, INPUT, { instant: REF_INSTANT }, (result) => {
+        expect(result).toBeDate(EXPECTED_INSTANT);
+    });
+
+    testSingleCase(chrono, INPUT, { instant: REF_INSTANT, timezone: null }, (result) => {
+        expect(result).toBeDate(EXPECTED_INSTANT);
+    });
+
+    testSingleCase(chrono, INPUT, { instant: REF_INSTANT, timezone: "" }, (result) => {
+        expect(result).toBeDate(EXPECTED_INSTANT);
+    });
+});
+
 test("Test - Timezone difference on reference date", function () {
     // Sun Jun 06 2021 19:00:00 GMT+0900 (JST)
     // Sun Jun 06 2021 11:00:00 GMT+0100 (BST)

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "sourceMap": false,
+    "sourceMap": true,
     "inlineSources": false,
     "inlineSourceMap": false,
     "noEmit": false,

package/src/calculation/weeks.ts

@@ -1,38 +0,0 @@
-import dayjs, { Dayjs } from "dayjs";
-
-export function toDayJSWeekday(refDate: Date, offset: number, modifier?: "this" | "next" | "last"): Dayjs {
-    if (!modifier) {
-        return toDayJSClosestWeekday(refDate, offset);
-    }
-
-    let date = dayjs(refDate);
-    switch (modifier) {
-        case "this":
-            date = date.day(offset);
-            break;
-
-        case "next":
-            date = date.day(offset + 7);
-            break;
-
-        case "last":
-            date = date.day(offset - 7);
-            break;
-    }
-
-    return date;
-}
-
-export function toDayJSClosestWeekday(refDate: Date, offset: number): Dayjs {
-    let date = dayjs(refDate);
-    const refOffset = date.day();
-    if (Math.abs(offset - 7 - refOffset) < Math.abs(offset - refOffset)) {
-        date = date.day(offset - 7);
-    } else if (Math.abs(offset + 7 - refOffset) < Math.abs(offset - refOffset)) {
-        date = date.day(offset + 7);
-    } else {
-        date = date.day(offset);
-    }
-
-    return date;
-}