New: BCE/CE year label support

Author: Wanasit Tanakitrungruang

src/locales/en/constants.ts

@@ -198,22 +198,23 @@ export function parseOrdinalNumberPattern(match: string): number {
 
 //-----------------------------
 
-export const YEAR_PATTERN = `(?:[1-9][0-9]{0,3}\\s*(?:BE|AD|BC)|[1-2][0-9]{3}|[5-9][0-9])`;
+export const YEAR_PATTERN = `(?:[1-9][0-9]{0,3}\\s*(?:BE|AD|BC|BCE|CE)|[1-2][0-9]{3}|[5-9][0-9])`;
 export function parseYear(match: string): number {
     if (/BE/i.test(match)) {
         // Buddhist Era
         match = match.replace(/BE/i, "");
         return parseInt(match) - 543;
     }
 
-    if (/BC/i.test(match)) {
-        // Before Christ
-        match = match.replace(/BC/i, "");
+    if (/BCE?/i.test(match)) {
+        // Before Christ, Before Common Era
+        match = match.replace(/BCE?/i, "");
         return -parseInt(match);
     }
 
-    if (/AD/i.test(match)) {
-        match = match.replace(/AD/i, "");
+    if (/(AD|CE)/i.test(match)) {
+        // Anno Domini, Common Era
+        match = match.replace(/(AD|CE)/i, "");
         return parseInt(match);
     }
 

test/en/en_month_name_little_endian.test.ts

@@ -26,45 +26,6 @@ test("Test - Single expression", () => {
         expect(result.start).toBeDate(new Date(1982, 2 - 1, 3, 12));
     });
 
-    testSingleCase(chrono, "10 August 2555 BE", new Date(2012, 7, 10), (result) => {
-        expect(result.index).toBe(0);
-        expect(result.text).toBe("10 August 2555 BE");
-
-        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));
-    });
-
-    testSingleCase(chrono, "10 August 234 BC", new Date(2012, 7, 10), (result) => {
-        expect(result.index).toBe(0);
-        expect(result.text).toBe("10 August 234 BC");
-
-        expect(result.start).not.toBeNull();
-        expect(result.start.get("year")).toBe(-234);
-        expect(result.start.get("month")).toBe(8);
-        expect(result.start.get("day")).toBe(10);
-
-        expect(result.start).toBeDate(new Date(-234, 8 - 1, 10, 12));
-    });
-
-    testSingleCase(chrono, "10 August 88 AD", new Date(2012, 7, 10), (result) => {
-        expect(result.index).toBe(0);
-        expect(result.text).toBe("10 August 88 AD");
-
-        expect(result.start).not.toBeNull();
-        expect(result.start.get("year")).toBe(88);
-        expect(result.start.get("month")).toBe(8);
-        expect(result.start.get("day")).toBe(10);
-
-        const resultDate = result.start.date();
-        const expectDate = new Date(88, 8 - 1, 10, 12);
-        expectDate.setFullYear(88);
-        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
-    });
-
     testSingleCase(chrono, "Sun 15Sep", new Date(2013, 7, 10), (result) => {
         expect(result.index).toBe(0);
         expect(result.text).toBe("Sun 15Sep");

test/en/en_year.test.ts

@@ -0,0 +1,75 @@
+import * as chrono from "../../src";
+import { testSingleCase, testUnexpectedResult } from "../test_util";
+import ENTimeExpressionParser from "../../src/locales/en/parsers/ENTimeExpressionParser";
+
+test("Test - Year numbers with BCE/CE Era label", () => {
+    testSingleCase(chrono, "10 August 234 BCE", new Date(2012, 7, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("10 August 234 BCE"); // fails since text is `10 August 234`
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(-234);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+
+        expect(result.start).toBeDate(new Date(-234, 8 - 1, 10, 12));
+    });
+
+    testSingleCase(chrono, "10 August 88 CE", new Date(2012, 7, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("10 August 88 CE");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(88);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+
+        const resultDate = result.start.date();
+        const expectDate = new Date(88, 8 - 1, 10, 12);
+        expectDate.setFullYear(88);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+});
+
+test("Test - Year numbers with BC/AD Era label", () => {
+    testSingleCase(chrono, "10 August 234 BC", new Date(2012, 7, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("10 August 234 BC");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(-234);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+
+        expect(result.start).toBeDate(new Date(-234, 8 - 1, 10, 12));
+    });
+
+    testSingleCase(chrono, "10 August 88 AD", new Date(2012, 7, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("10 August 88 AD");
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get("year")).toBe(88);
+        expect(result.start.get("month")).toBe(8);
+        expect(result.start.get("day")).toBe(10);
+
+        const resultDate = result.start.date();
+        const expectDate = new Date(88, 8 - 1, 10, 12);
+        expectDate.setFullYear(88);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime());
+    });
+});
+
+test("Test - Year numbers with Buddhist Era label", () => {
+    testSingleCase(chrono, "10 August 2555 BE", new Date(2012, 7, 10), (result) => {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe("10 August 2555 BE");
+
+        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));
+    });
+});