Merge branch 'master' into test-it-locale-coverage

Author: wanasit

package-lock.json

@@ -15,7 +15,7 @@
     "preset": "ts-jest"
   },
   "license": "MIT",
-  "version": "2.8.4",
+  "version": "2.9.0",
   "directories": {
     "source": "./src",
     "test": "./test"
@@ -81,9 +81,7 @@
     "test": "jest --coverage",
     "test:silent": "jest --silent"
   },
-  "dependencies": {
-    "dayjs": "^1.10.0"
-  },
+  "dependencies": {},
   "eslintConfig": {
     "env": {
       "es6": true,

package.json

@@ -22,24 +22,18 @@ export function today(reference: ReferenceWithTimezone): ParsingComponents {
     return component;
 }
 
-/**
- * The previous day. Imply the same time.
- */
 export function yesterday(reference: ReferenceWithTimezone): ParsingComponents {
     return theDayBefore(reference, 1).addTag("casualReference/yesterday");
 }
 
-export function theDayBefore(reference: ReferenceWithTimezone, numDay: number): ParsingComponents {
-    return theDayAfter(reference, -numDay);
-}
-
-/**
- * The following day with dayjs.assignTheNextDay()
- */
 export function tomorrow(reference: ReferenceWithTimezone): ParsingComponents {
     return theDayAfter(reference, 1).addTag("casualReference/tomorrow");
 }
 
+export function theDayBefore(reference: ReferenceWithTimezone, numDay: number): ParsingComponents {
+    return theDayAfter(reference, -numDay);
+}
+
 export function theDayAfter(reference: ReferenceWithTimezone, nDays: number): ParsingComponents {
     const targetDate = reference.getDateWithAdjustedTimezone();
     const component = new ParsingComponents(reference, {});

src/common/casualReferences.ts

@@ -51,7 +51,6 @@ const MINUTE_GROUP = 3;
 const SECOND_GROUP = 4;
 const AM_PM_HOUR_GROUP_2 = 5;
 
-
 export default class JPTimeExpressionParser extends AbstractParserWithWordBoundaryChecking {
     innerPattern(): RegExp {
         return FIRST_REG_PATTERN;
@@ -64,8 +63,13 @@ export default class JPTimeExpressionParser extends AbstractParserWithWordBounda
         }
 
         const result = context.createParsingResult(match.index, match[0]);
-        result.start = createTimeComponents(context,
-            match[HOUR_GROUP], match[MINUTE_GROUP], match[SECOND_GROUP], match[AM_PM_HOUR_GROUP_1] ?? match[AM_PM_HOUR_GROUP_2]);
+        result.start = createTimeComponents(
+            context,
+            match[HOUR_GROUP],
+            match[MINUTE_GROUP],
+            match[SECOND_GROUP],
+            match[AM_PM_HOUR_GROUP_1] ?? match[AM_PM_HOUR_GROUP_2]
+        );
         if (!result.start) {
             match.index += match[0].length; // Skip over potential overlapping pattern
             return null;
@@ -82,7 +86,12 @@ export default class JPTimeExpressionParser extends AbstractParserWithWordBounda
 
         result.text = result.text + match[0];
         result.end = createTimeComponents(
-            context, match[HOUR_GROUP], match[MINUTE_GROUP], match[SECOND_GROUP], match[AM_PM_HOUR_GROUP_1] ?? match[AM_PM_HOUR_GROUP_2]);
+            context,
+            match[HOUR_GROUP],
+            match[MINUTE_GROUP],
+            match[SECOND_GROUP],
+            match[AM_PM_HOUR_GROUP_1] ?? match[AM_PM_HOUR_GROUP_2]
+        );
         if (!result.end) {
             return null;
         }
@@ -104,15 +113,13 @@ export default class JPTimeExpressionParser extends AbstractParserWithWordBounda
     }
 }
 
-
 function createTimeComponents(
     context: ParsingContext,
     matchHour: string | null,
     matchMinute: string | null,
     matchSecond: string | null,
-    matchAmPm: string | null,
+    matchAmPm: string | null
 ): ParsingComponents | null {
-
     let hour = 0;
     let meridiem = -1;
     let targetComponents = context.createParsingComponents();
@@ -147,7 +154,7 @@ function createTimeComponents(
     }
 
     if (matchAmPm) {
-        if (hour > 12)  {
+        if (hour > 12) {
             return null;
         }
         const AMPMString = matchAmPm;
@@ -162,8 +169,6 @@ function createTimeComponents(
 
     targetComponents.assign("hour", hour);
 
-
-
     if (meridiem >= 0) {
         targetComponents.assign("meridiem", meridiem);
     } else {

src/locales/ja/parsers/JPTimeExpressionParser.ts

@@ -1,11 +1,8 @@
 import { Component, ParsedComponents, ParsedResult, ParsingReference, TimezoneAbbrMap } from "./types";
 
-import quarterOfYear from "dayjs/plugin/quarterOfYear";
-import dayjs, { QUnitType } from "dayjs";
 import { assignSimilarDate, assignSimilarTime, implySimilarTime } from "./utils/dates";
 import { toTimezoneOffset } from "./timezone";
 import { addDuration, Duration, EmptyDuration } from "./calculation/duration";
-dayjs.extend(quarterOfYear);
 
 export class ReferenceWithTimezone {
     readonly instant: Date;
@@ -256,10 +253,6 @@ export class ParsingComponents implements ParsedComponents {
             reference: ${JSON.stringify(this.reference)}]`;
     }
 
-    dayjs() {
-        return dayjs(this.dateWithoutTimezoneAdjustment());
-    }
-
     date(): Date {
         const date = this.dateWithoutTimezoneAdjustment();
         const timezoneAdjustment = this.reference.getSystemTimezoneAdjustmentMinute(date, this.get("timezoneOffset"));

src/results.ts

@@ -2,44 +2,43 @@ import * as chrono from "../../src/";
 import { testSingleCase } from "../test_util";
 
 test("Test - Single Expression", () => {
-  testSingleCase(chrono.it.casual, "La scadenza è ora", new Date(2012, 7, 10, 8, 9, 10, 11), (result) => {
-    expect(result.index).toBe(14);
-    expect(result.text).toBe("ora");
-
-    expect(result.start).not.toBeNull();
-    expect(result.start.get("year")).toBe(2012);
-    expect(result.start.get("month")).toBe(8);
-    expect(result.start.get("day")).toBe(10);
-    expect(result.start.get("hour")).toBe(8);
-    expect(result.start.get("minute")).toBe(9);
-    expect(result.start.get("second")).toBe(10);
-    expect(result.start.get("millisecond")).toBe(11);
-
-    expect(result.start).toBeDate(new Date(2012, 7, 10, 8, 9, 10, 11));
-  });
-
-  // testSingleCase(chrono.it.casual, "La scadenza era ieri", new Date(2012, 7, 10, 12), (result) => {
-  //   expect(result.index).toBe(16);
-  //   expect(result.text).toBe("ieri");
-  //
-  //   expect(result.start).not.toBeNull();
-  //   expect(result.start.get("year")).toBe(2012);
-  //   expect(result.start.get("month")).toBe(8);
-  //   expect(result.start.get("day")).toBe(9);
-  //
-  //   expect(result.start).toBeDate(new Date(2012, 7, 9, 12));
-  // });
-
-  testSingleCase(chrono.it.casual, "La scadenza è domani", new Date(2012, 7, 10, 17, 10), (result) => {
-    expect(result.index).toBe(14);
-    expect(result.text).toBe("domani");
-
-    expect(result.start).not.toBeNull();
-    expect(result.start.get("year")).toBe(2012);
-    expect(result.start.get("month")).toBe(8);
-    expect(result.start.get("day")).toBe(11);
-
-    expect(result.start).toBeDate(new Date(2012, 7, 11, 17, 10));
-  });
-
+    testSingleCase(chrono.it.casual, "La scadenza è ora", new Date(2012, 7, 10, 8, 9, 10, 11), (result) => {
+        expect(result.index).toBe(14);
+        expect(result.text).toBe("ora");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+        expect(result.start.get("hour")).toBe(8);
+        expect(result.start.get("minute")).toBe(9);
+        expect(result.start.get("second")).toBe(10);
+        expect(result.start.get("millisecond")).toBe(11);
+
+        expect(result.start).toBeDate(new Date(2012, 7, 10, 8, 9, 10, 11));
+    });
+
+    testSingleCase(chrono.it.casual, "La scadenza è oggi", new Date(2012, 7, 10, 14, 12), (result) => {
+        expect(result.index).toBe(14);
+        expect(result.text).toBe("oggi");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+
+        expect(result.start).toBeDate(new Date(2012, 7, 10, 14, 12));
+    });
+
+    testSingleCase(chrono.it.casual, "La scadenza è domani", new Date(2012, 7, 10, 17, 10), (result) => {
+        expect(result.index).toBe(14);
+        expect(result.text).toBe("domani");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(11);
+
+        expect(result.start).toBeDate(new Date(2012, 7, 11, 17, 10));
+    });
 });

test/it/it_casual.test.ts

@@ -2,27 +2,27 @@ import * as chrono from "../../src/";
 import { testSingleCase, testUnexpectedResult } from "../test_util";
 
 test("Test - Single expression", () => {
-  testSingleCase(chrono.it, "10 Agosto 2012", new Date(2012, 7, 10), (result) => {
-    expect(result.start).not.toBeNull();
-    expect(result.start.get("year")).toBe(2012);
-    expect(result.start.get("month")).toBe(8);
-    expect(result.start.get("day")).toBe(10);
+    testSingleCase(chrono.it, "10 Agosto 2012", new Date(2012, 7, 10), (result) => {
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
 
-    expect(result.index).toBe(0);
-    expect(result.text).toBe("10 Agosto 2012");
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("10 Agosto 2012");
 
-    expect(result.start).toBeDate(new Date(2012, 8 - 1, 10, 12));
-  });
+        expect(result.start).toBeDate(new Date(2012, 8 - 1, 10, 12));
+    });
 
-  testSingleCase(chrono.it, "La scadenza è il 10 Agosto", new Date(2012, 7, 10), (result) => {
-    expect(result.index).toBe(17);
-    expect(result.text).toBe("10 Agosto");
+    testSingleCase(chrono.it, "La scadenza è il 10 Agosto", new Date(2012, 7, 10), (result) => {
+        expect(result.index).toBe(17);
+        expect(result.text).toBe("10 Agosto");
 
-    expect(result.start).not.toBeNull();
-    expect(result.start.get("year")).toBe(2012);
-    expect(result.start.get("month")).toBe(8);
-    expect(result.start.get("day")).toBe(10);
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
 
-    expect(result.start).toBeDate(new Date(2012, 8 - 1, 10, 12));
-  });
+        expect(result.start).toBeDate(new Date(2012, 8 - 1, 10, 12));
+    });
 });

test/it/it_month_name_little_endian.test.ts

@@ -2,36 +2,36 @@ import * as chrono from "../../src/";
 import { testSingleCase } from "../test_util";
 
 test("Test - Single Expression", function () {
-  testSingleCase(chrono.it, "Lunedì", new Date(2012, 7, 9), (result) => {
-    expect(result.index).toBe(0);
-    expect(result.text).toBe("Lunedì");
+    testSingleCase(chrono.it, "Lunedì", new Date(2012, 7, 9), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("Lunedì");
 
-    expect(result.start).not.toBeNull();
-    expect(result.start.get("year")).toBe(2012);
-    expect(result.start.get("month")).toBe(8);
-    expect(result.start.get("day")).toBe(6);
-    expect(result.start.get("weekday")).toBe(1);
-  });
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(6);
+        expect(result.start.get("weekday")).toBe(1);
+    });
 
-  testSingleCase(chrono.it, "Giovedì", new Date(2012, 7, 9), (result) => {
-    expect(result.index).toBe(0);
-    expect(result.text).toBe("Giovedì");
+    testSingleCase(chrono.it, "Giovedì", new Date(2012, 7, 9), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("Giovedì");
 
-    expect(result.start).not.toBeNull();
-    expect(result.start.get("year")).toBe(2012);
-    expect(result.start.get("month")).toBe(8);
-    expect(result.start.get("day")).toBe(9);
-    expect(result.start.get("weekday")).toBe(4);
-  });
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(9);
+        expect(result.start.get("weekday")).toBe(4);
+    });
 
-  testSingleCase(chrono.it, "Domenica", new Date(2012, 7, 9), (result) => {
-    expect(result.index).toBe(0);
-    expect(result.text).toBe("Domenica");
+    testSingleCase(chrono.it, "Domenica", new Date(2012, 7, 9), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("Domenica");
 
-    expect(result.start).not.toBeNull();
-    expect(result.start.get("year")).toBe(2012);
-    expect(result.start.get("month")).toBe(8);
-    expect(result.start.get("day")).toBe(12);
-    expect(result.start.get("weekday")).toBe(0);
-  });
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(2012);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(12);
+        expect(result.start.get("weekday")).toBe(0);
+    });
 });