chrono-node 1.4.7 → 1.4.9

package/test/zh/zh_hant_casual.test.js

@@ -1,10 +1,14 @@
-import * as chrono from '../../src/chrono';
-import { testSingleCase } from '../test_util';
+var chrono = require('../../src/chrono');
 
 test("Test - Single Expression", function() {
 
 
-    testSingleCase(chrono.casual, '雞而家全部都係雞', new Date(2012, 7, 10, 8, 9, 10, 11), (result) => {
+    var text = "雞而家全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 8, 9, 10, 11));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(1);
         expect(result.text).toBe('而家');
 
@@ -17,11 +21,18 @@ test("Test - Single Expression", function() {
         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));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 8, 9, 10, 11);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
 
+    var text = "雞今日全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1);
 
-    testSingleCase(chrono.casual, '雞今日全部都係雞', new Date(2012, 7, 10, 12), (result) => {
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(1);
         expect(result.text).toBe('今日');
 
@@ -30,11 +41,18 @@ test("Test - Single Expression", function() {
         expect(result.start.get('month')).toBe(8);
         expect(result.start.get('day')).toBe(10);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 12));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 
 
-    testSingleCase(chrono.casual, '雞聽日全部都係雞', new Date(2012, 7, 10, 12), (result) => {
+    var text = "雞聽日全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(1);
         expect(result.text).toBe('聽日');
 
@@ -43,24 +61,52 @@ test("Test - Single Expression", function() {
         expect(result.start.get('month')).toBe(8);
         expect(result.start.get('day')).toBe(11);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 11, 12));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 11, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 
     // Say.."Tomorrow" in the late night (1 AM)
-    testSingleCase(chrono.casual, '雞明天全部都係雞', new Date(2012, 7, 10, 1), (result) => {
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 12));
-    });
-
-    testSingleCase(chrono.casual, '雞後天凌晨全部都係雞', new Date(2012, 7, 10, 0, 0), (result) => {
-        expect(result.start).toBeDate(new Date(2012, 7, 12, 0, 0));
-    });
-
-    testSingleCase(chrono.casual, '雞大前天凌晨全部都係雞', new Date(2012, 7, 10, 0, 0), (result) => {
-        expect(result.start).toBeDate(new Date(2012, 7, 7, 0, 0));
-    });
-
-
-    testSingleCase(chrono.casual, '雞琴日全部都係雞', new Date(2012, 7, 10, 12), (result) => {
+    var text = "雞明天全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 1));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if(result){
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "雞後天凌晨全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 0, 0));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if(result){
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 12, 0, 0);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "雞大前天凌晨全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 0, 0));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if(result){
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 7, 0, 0);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+
+    var text = "雞琴日全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(1);
         expect(result.text).toBe('琴日');
 
@@ -69,11 +115,18 @@ test("Test - Single Expression", function() {
         expect(result.start.get('month')).toBe(8);
         expect(result.start.get('day')).toBe(9);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 9, 12));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 9, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 
 
-    testSingleCase(chrono.casual, '雞昨天晚上全部都係雞', new Date(2012, 7, 10, 12), (result) => {
+    var text = "雞昨天晚上全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(1);
         expect(result.text).toBe('昨天晚上');
 
@@ -83,11 +136,18 @@ test("Test - Single Expression", function() {
         expect(result.start.get('day')).toBe(9);
         expect(result.start.get('hour')).toBe(22);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 9, 22));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 9, 22);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
 
+    var text = "雞今日朝早全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1);
 
-    testSingleCase(chrono.casual, '雞今日朝早全部都係雞', new Date(2012, 7, 10, 12), (result) => {
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(1);
         expect(result.text).toBe('今日朝早');
 
@@ -97,11 +157,18 @@ test("Test - Single Expression", function() {
         expect(result.start.get('day')).toBe(10);
         expect(result.start.get('hour')).toBe(6);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 6));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 6);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
 
+    var text = "雞晏晝全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1);
 
-    testSingleCase(chrono.casual, '雞晏晝全部都係雞', new Date(2012, 7, 10, 12), (result) => {
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(1);
         expect(result.text).toBe('晏晝');
 
@@ -111,11 +178,18 @@ test("Test - Single Expression", function() {
         expect(result.start.get('day')).toBe(10);
         expect(result.start.get('hour')).toBe(15);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 15));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 15);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 
 
-    testSingleCase(chrono.casual, '雞今晚全部都係雞', new Date(2012, 7, 10, 12), (result) => {
+    var text = "雞今晚全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(1);
         expect(result.text).toBe('今晚');
 
@@ -125,15 +199,22 @@ test("Test - Single Expression", function() {
         expect(result.start.get('day')).toBe(10);
         expect(result.start.get('hour')).toBe(22);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 22));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 22);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 });
 
 
 test("Test - Combined Expression", function() {
 
 
-    testSingleCase(chrono.casual, '雞今日晏晝5點全部都係雞', new Date(2012, 7, 10, 12), (result) => {
+    var text = "雞今日晏晝5點全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(1);
         expect(result.text).toBe('今日晏晝5點');
 
@@ -143,14 +224,21 @@ test("Test - Combined Expression", function() {
         expect(result.start.get('day')).toBe(10);
         expect(result.start.get('hour')).toBe(17);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 17));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 17);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 });
 
 
 test("Test - Casual date range", function() {
 
-    testSingleCase(chrono.casual, '雞今日 - 下禮拜五全部都係雞', new Date(2012, 7, 4, 12), (result) => {
+    var text = "雞今日 - 下禮拜五全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 4, 12));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(1);
         expect(result.text).toBe('今日 - 下禮拜五');
 
@@ -160,7 +248,9 @@ test("Test - Casual date range", function() {
         expect(result.start.get('day')).toBe(4);
         expect(result.start.get('hour')).toBe(12);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 4, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 4, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
 
 
         expect(result.end).not.toBeNull();
@@ -169,12 +259,19 @@ test("Test - Casual date range", function() {
         expect(result.end.get('day')).toBe(10);
         expect(result.end.get('hour')).toBe(12);
 
-        expect(result.end).toBeDate(new Date(2012, 7, 10, 12));
-    });
+        var resultDate = result.end.date();
+        var expectDate = new Date(2012, 7, 10, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 
 
 
-    testSingleCase(chrono.casual, '雞今日 - 下禮拜五全部都係雞', new Date(2012, 7, 10, 12), (result) => {
+    var text = "雞今日 - 下禮拜五全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(1);
         expect(result.text).toBe('今日 - 下禮拜五');
 
@@ -184,7 +281,9 @@ test("Test - Casual date range", function() {
         expect(result.start.get('day')).toBe(10);
         expect(result.start.get('hour')).toBe(12);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
 
 
         expect(result.end).not.toBeNull();
@@ -193,8 +292,10 @@ test("Test - Casual date range", function() {
         expect(result.end.get('day')).toBe(17);
         expect(result.end.get('hour')).toBe(12);
 
-        expect(result.end).toBeDate(new Date(2012, 7, 17, 12));
-    });
+        var resultDate = result.end.date();
+        var expectDate = new Date(2012, 7, 17, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 });
 
 
@@ -203,41 +304,37 @@ test("Test - Casual date range", function() {
 
 test('Test - Random text', function() {
 
-    testSingleCase(chrono, '今日夜晚', new Date(2012, 1-1, 1, 12), (result, text) => {
-
-        expect(result.text).toBe(text);
-        expect(result.start.get('year')).toBe(2012);
-        expect(result.start.get('month')).toBe(1);
-        expect(result.start.get('day')).toBe(1);
-        expect(result.start.get('hour')).toBe(22);
-        expect(result.start.get('meridiem') ).toBe(1);
-    });
-
-    testSingleCase(chrono, '今晚8點正', new Date(2012, 1-1, 1, 12), (result, text) => {
-
-        expect(result.text).toBe(text);
-        expect(result.start.get('hour') ).toBe(20);
-        expect(result.start.get('year') ).toBe(2012);
-        expect(result.start.get('month')).toBe(1);
-        expect(result.start.get('day')  ).toBe(1);
-        expect(result.start.get('meridiem') ).toBe(1);
-    });
-
-
-    testSingleCase(chrono, '晚上8點', new Date(2012, 1-1, 1, 12), (result, text) => {
-
-        expect(result.text).toBe(text);
-        expect(result.start.get('hour') ).toBe(20);
-        expect(result.start.get('year') ).toBe(2012);
-        expect(result.start.get('month')).toBe(1);
-        expect(result.start.get('day')  ).toBe(1);
-        expect(result.start.get('meridiem') ).toBe(1);
-    });
-
-
-    testSingleCase(chrono, '星期四', (result, text) => {
-
-        expect(result.text).toBe(text);
-        expect(result.start.get('weekday')).toBe(4);
-    });
+    var text = "今日夜晚";
+    var result = chrono.parse(text, new Date(2012, 1-1, 1, 12))[0];
+    expect(result.text).toBe(text);
+    expect(result.start.get('year')).toBe(2012);
+    expect(result.start.get('month')).toBe(1);
+    expect(result.start.get('day')).toBe(1);
+    expect(result.start.get('hour')).toBe(22);
+    expect(result.start.get('meridiem') ).toBe(1);
+
+    var text = "今晚8點正";
+    var result = chrono.parse(text, new Date(2012, 1-1, 1, 12))[0];
+    expect(result.text).toBe(text);
+    expect(result.start.get('hour') ).toBe(20);
+    expect(result.start.get('year') ).toBe(2012);
+    expect(result.start.get('month')).toBe(1);
+    expect(result.start.get('day')  ).toBe(1);
+    expect(result.start.get('meridiem') ).toBe(1);
+
+
+    var text = "晚上8點";
+    var result = chrono.parse(text, new Date(2012, 1-1, 1, 12))[0];
+    expect(result.text).toBe(text);
+    expect(result.start.get('hour') ).toBe(20);
+    expect(result.start.get('year') ).toBe(2012);
+    expect(result.start.get('month')).toBe(1);
+    expect(result.start.get('day')  ).toBe(1);
+    expect(result.start.get('meridiem') ).toBe(1);
+
+
+    var text = "星期四";
+    var result = chrono.parse(text)[0];
+    expect(result.text).toBe(text);
+    expect(result.start.get('weekday')).toBe(4);
 });

package/test/zh/zh_hant_date.test.js

@@ -1,84 +1,118 @@
-import * as chrono from '../../src/chrono';
-import { testSingleCase } from '../test_util';
-
+var chrono = require('../../src/chrono');
 test("Test - Single Expression", function() {
 
-    testSingleCase(chrono, '雞2016年9月3號全部都係雞', new Date(2012,8-1,10), (result) => {
-        expect(result.index).toBe(1);
-        expect(result.text).toBe('2016年9月3號');
-
-        expect(result.start).not.toBeNull();
-        expect(result.start.get('year')).toBe(2016);
-        expect(result.start.get('month')).toBe(9);
-        expect(result.start.get('day')).toBe(3);
-
-        expect(result.start).toBeDate(new Date(2016, 9-1, 3, 12));
-    });
-
-    testSingleCase(chrono, '雞二零一六年，九月三號全部都係雞', new Date(2012,8-1,10), (result) => {
-        expect(result.index).toBe(1);
-        expect(result.text).toBe('二零一六年，九月三號');
-
-        expect(result.start).not.toBeNull();
-        expect(result.start.get('year')).toBe(2016);
-        expect(result.start.get('month')).toBe(9);
-        expect(result.start.get('day')).toBe(3);
-
-        expect(result.start).toBeDate(new Date(2016, 9-1, 3, 12));
-    });
-
-    testSingleCase(chrono, '雞九月三號全部都係雞', new Date(2014,8-1,10), (result) => {
-        expect(result.index).toBe(1);
-        expect(result.text).toBe('九月三號');
-
-        expect(result.start).not.toBeNull();
-        expect(result.start.get('year')).toBe(2014);
-        expect(result.start.get('month')).toBe(9);
-        expect(result.start.get('day')).toBe(3);
-
-        expect(result.start).toBeDate(new Date(2014, 9-1, 3, 12));
-    });
+    var text = "雞2016年9月3號全部都係雞";
+    var results = chrono.parse(text, new Date(2012,8-1,10));
+    expect(results.length).toBe(1)
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(1)
+        expect(result.text).toBe('2016年9月3號')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.get('year')).toBe(2016)
+        expect(result.start.get('month')).toBe(9)
+        expect(result.start.get('day')).toBe(3)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2016, 9-1, 3, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "雞二零一六年，九月三號全部都係雞";
+    var results = chrono.parse(text, new Date(2012,8-1,10));
+    expect(results.length).toBe(1)
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(1)
+        expect(result.text).toBe('二零一六年，九月三號')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.get('year')).toBe(2016)
+        expect(result.start.get('month')).toBe(9)
+        expect(result.start.get('day')).toBe(3)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2016, 9-1, 3, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "雞九月三號全部都係雞";
+    var results = chrono.parse(text, new Date(2014,8-1,10));
+    expect(results.length).toBe(1)
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(1)
+        expect(result.text).toBe('九月三號')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.get('year')).toBe(2014)
+        expect(result.start.get('month')).toBe(9)
+        expect(result.start.get('day')).toBe(3)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2014, 9-1, 3, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 });
 
 
 test("Test - Range Expression", function() {
 
-    testSingleCase(chrono, '2016年9月3號-2017年10月24號', new Date(2012,8-1,10), (result) => {
-        expect(result.index).toBe(0);
-        expect(result.text).toBe('2016年9月3號-2017年10月24號');
-
-        expect(result.start).not.toBeNull();
-        expect(result.start.get('year')).toBe(2016);
-        expect(result.start.get('month')).toBe(9);
-        expect(result.start.get('day')).toBe(3);
-
-        expect(result.start).toBeDate(new Date(2016, 9-1, 3, 12));
-
-        expect(result.end).not.toBeNull();
-        expect(result.end.get('year')).toBe(2017);
-        expect(result.end.get('month')).toBe(10);
-        expect(result.end.get('day')).toBe(24);
-
-        expect(result.end).toBeDate(new Date(2017, 10-1, 24, 12));
-    });
-
-    testSingleCase(chrono, '二零一六年九月三號ー2017年10月24號', new Date(2012,8-1,10), (result) => {
-        expect(result.index).toBe(0);
-        expect(result.text).toBe('二零一六年九月三號ー2017年10月24號');
-
-        expect(result.start).not.toBeNull();
-        expect(result.start.get('year')).toBe(2016);
-        expect(result.start.get('month')).toBe(9);
-        expect(result.start.get('day')).toBe(3);
-
-        expect(result.start).toBeDate(new Date(2016, 9-1, 3, 12));
-
-        expect(result.end).not.toBeNull();
-        expect(result.end.get('year')).toBe(2017);
-        expect(result.end.get('month')).toBe(10);
-        expect(result.end.get('day')).toBe(24);
-
-        expect(result.end).toBeDate(new Date(2017, 10-1, 24, 12));
-    });
+    var text = "2016年9月3號-2017年10月24號";
+    var results = chrono.parse(text, new Date(2012,8-1,10));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(0)
+        expect(result.text).toBe('2016年9月3號-2017年10月24號')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.get('year')).toBe(2016)
+        expect(result.start.get('month')).toBe(9)
+        expect(result.start.get('day')).toBe(3)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2016, 9-1, 3, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+
+        expect(result.end).not.toBeNull()
+        expect(result.end.get('year')).toBe(2017)
+        expect(result.end.get('month')).toBe(10)
+        expect(result.end.get('day')).toBe(24)
+
+        var resultDate = result.end.date();
+        var expectDate = new Date(2017, 10-1, 24, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "二零一六年九月三號ー2017年10月24號";
+    var results = chrono.parse(text, new Date(2012,8-1,10));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(0)
+        expect(result.text).toBe('二零一六年九月三號ー2017年10月24號')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.get('year')).toBe(2016)
+        expect(result.start.get('month')).toBe(9)
+        expect(result.start.get('day')).toBe(3)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2016, 9-1, 3, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+
+        expect(result.end).not.toBeNull()
+        expect(result.end.get('year')).toBe(2017)
+        expect(result.end.get('month')).toBe(10)
+        expect(result.end.get('day')).toBe(24)
+
+        var resultDate = result.end.date();
+        var expectDate = new Date(2017, 10-1, 24, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 
 });