chrono-node 1.4.7 → 1.4.9

package/test/de/de_weekday.test.js

@@ -1,9 +1,12 @@
-import * as chrono from '../../src/chrono';
-import { testSingleCase } from '../test_util';
-
+var chrono = require('../../src/chrono');
 test("Test - Single Expression", function () {
 
-    testSingleCase(chrono.de, 'Montag', new Date(2012, 7, 9), (result) => {
+    var text = "Montag";
+    var results = chrono.de.parse(text, new Date(2012, 7, 9));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if (result) {
         expect(result.index).toBe(0);
         expect(result.text).toBe('Montag');
 
@@ -19,11 +22,18 @@ test("Test - Single Expression", function () {
         expect(result.start.isCertain('year')).toBe(false);
         expect(result.start.isCertain('weekday')).toBe(true);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 6, 12));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 6, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
 
+    var text = "am Donnerstag";
+    var results = chrono.de.parse(text, new Date(2012, 7, 9));
+    expect(results.length).toBe(1);
 
-    testSingleCase(chrono.de, 'am Donnerstag', new Date(2012, 7, 9), (result) => {
+    var result = results[0];
+    if (result) {
         expect(result.index).toBe(0);
         expect(result.text).toBe('am Donnerstag');
 
@@ -33,10 +43,17 @@ test("Test - Single Expression", function () {
         expect(result.start.get('day')).toBe(9);
         expect(result.start.get('weekday')).toBe(4);
 
-        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.de, 'Sonntag', new Date(2012, 7, 9), (result) => {
+    var text = "Sonntag";
+    var results = chrono.de.parse(text, new Date(2012, 7, 9));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if (result) {
         expect(result.index).toBe(0);
         expect(result.text).toBe('Sonntag');
 
@@ -46,11 +63,18 @@ test("Test - Single Expression", function () {
         expect(result.start.get('day')).toBe(12);
         expect(result.start.get('weekday')).toBe(0);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 12, 12));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 12, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
 
+    var text = "Die Deadline war letzten Freitag...";
+    var results = chrono.de.parse(text, new Date(2012, 7, 9));
+    expect(results.length).toBe(1);
 
-    testSingleCase(chrono.de, 'Die Deadline war letzten Freitag...', new Date(2012, 7, 9), (result) => {
+    var result = results[0];
+    if (result) {
         expect(result.index).toBe(17);
         expect(result.text).toBe('letzten Freitag');
 
@@ -60,11 +84,18 @@ test("Test - Single Expression", function () {
         expect(result.start.get('day')).toBe(3);
         expect(result.start.get('weekday')).toBe(5);
 
-        expect(result.start).toBeDate(new Date(2012, 7, 3, 12));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 3, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 
 
-    testSingleCase(chrono.de, 'Treffen wir uns am Freitag nächste Woche', new Date(2015, 3, 18), (result) => {
+    var text = "Treffen wir uns am Freitag nächste Woche";
+    var results = chrono.de.parse(text, new Date(2015, 3, 18));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if (result) {
         expect(result.index).toBe(16);
         expect(result.text).toBe('am Freitag nächste Woche');
 
@@ -74,11 +105,18 @@ test("Test - Single Expression", function () {
         expect(result.start.get('day')).toBe(24);
         expect(result.start.get('weekday')).toBe(5);
 
-        expect(result.start).toBeDate(new Date(2015, 3, 24, 12));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2015, 3, 24, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
 
+    var text = "Ich habe vor, am Dienstag nächste Woche freizunehmen";
+    var results = chrono.de.parse(text, new Date(2015, 3, 18));
+    expect(results.length).toBe(1);
 
-    testSingleCase(chrono.de, 'Ich habe vor, am Dienstag nächste Woche freizunehmen', new Date(2015, 3, 18), (result) => {
+    var result = results[0];
+    if (result) {
         expect(result.index).toBe(14);
         expect(result.text).toBe('am Dienstag nächste Woche');
 
@@ -88,14 +126,21 @@ test("Test - Single Expression", function () {
         expect(result.start.get('day')).toBe(21);
         expect(result.start.get('weekday')).toBe(2);
 
-        expect(result.start).toBeDate(new Date(2015, 3, 21, 12));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2015, 3, 21, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 });
 
 
 test("Test - Weekday Overlap", function () {
 
-    testSingleCase(chrono.de, 'Sonntag, den 7. Dezember 2014', new Date(2012, 7, 9), (result) => {
+    var text = "Sonntag, den 7. Dezember 2014";
+    var results = chrono.de.parse(text, new Date(2012, 7, 9));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if (result) {
         expect(result.index).toBe(0);
         expect(result.text).toBe('Sonntag, den 7. Dezember 2014');
 
@@ -111,11 +156,18 @@ test("Test - Weekday Overlap", function () {
         expect(result.start.isCertain('year')).toBe(true);
         expect(result.start.isCertain('weekday')).toBe(true);
 
-        expect(result.start).toBeDate(new Date(2014, 12 - 1, 7, 12));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2014, 12 - 1, 7, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 
 
-    testSingleCase(chrono.de, 'Sonntag 7.12.2014', new Date(2012, 7, 9), (result) => {
+    var text = "Sonntag 7.12.2014";
+    var results = chrono.de.parse(text, new Date(2012, 7, 9));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if (result) {
         expect(result.index).toBe(0);
         expect(result.text).toBe('Sonntag 7.12.2014');
 
@@ -131,14 +183,21 @@ test("Test - Weekday Overlap", function () {
         expect(result.start.isCertain('year')).toBe(true);
         expect(result.start.isCertain('weekday')).toBe(true);
 
-        expect(result.start).toBeDate(new Date(2014, 12 - 1, 7, 12));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2014, 12 - 1, 7, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 });
 
 
 test('Test - forward dates only option', function () {
 
-    testSingleCase(chrono.de, 'diesen Freitag bis diesen Montag', new Date(2016, 8-1, 4), {forwardDate: true}, (result) => {
+    var text = "diesen Freitag bis diesen Montag";
+    var results = chrono.de.parse(text, new Date(2016, 8-1, 4), {forwardDate: true});
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if (result) {
         expect(result.index).toBe(0);
         expect(result.text).toBe('diesen Freitag bis diesen Montag');
 
@@ -153,7 +212,9 @@ test('Test - forward dates only option', function () {
         expect(result.start.isCertain('year')).toBe(false);
         expect(result.start.isCertain('weekday')).toBe(true);
 
-        expect(result.start).toBeDate(new Date(2016, 8-1, 5, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2016, 8-1, 5, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
 
 
         expect(result.end).not.toBeNull();
@@ -167,6 +228,8 @@ test('Test - forward dates only option', function () {
         expect(result.end.isCertain('year')).toBe(false);
         expect(result.end.isCertain('weekday')).toBe(true);
 
-        expect(result.end).toBeDate(new Date(2016, 8-1, 8, 12));
-    });
+        var resultDate = result.end.date();
+        var expectDate = new Date(2016, 8-1, 8, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 });

package/test/en/en.test.js

@@ -1,14 +1,13 @@
-import * as chrono from '../../src/chrono';
-import { testSingleCase, testUnexpectedResult } from '../test_util';
+var chrono = require('../../src/chrono');
 
 
 test("Test - Date + Time Expression", function() {
 
-    const text = "Something happen on 2014-04-18 13:00 - 16:00 as";
-    const results = chrono.parse(text, new Date(2012,7,10));
-    expect(results.length).toBe(1);
+    var text = "Something happen on 2014-04-18 13:00 - 16:00 as";
+    var results = chrono.parse(text, new Date(2012,7,10));
+    expect(results.length).toBe(1)
     expect(results[0].text).toBe('2014-04-18 13:00 - 16:00')
-
+    
 });
 
 
@@ -17,114 +16,117 @@ test("Test - Compare with native js", function() {
     var text = 'Sat Nov 05 1994 22:45:30 GMT+0900 (JST)';
     var result = chrono.parse(text)[0];
     var expected = new Date(text);
-
+    
     expect(result.text).toBe(text);
-    expect(expected.getTime()).toBeCloseTo(result.start.date().getTime());
+    expect(expected.getTime()).toBeCloseTo(result.start.date().getTime())
 
 
     var text = 'Fri, 31 Mar 2000 07:00:00 UTC';
     var result = chrono.parse(text)[0];
     var expected = new Date(text);
-
+    
     expect(result.text).toBe(text);
-    expect(expected.getTime()).toBeCloseTo(result.start.date().getTime());
+    expect(expected.getTime()).toBeCloseTo(result.start.date().getTime())
 
     var text = '2014-12-14T18:22:14.759Z';
     var result = chrono.parse(text)[0];
     var expected = new Date(text);
-
+    
     expect(result.text).toBe(text);
     expect(Math.abs(expected.getTime() - result.start.date().getTime())).toBe(0)
 });
 
 test("Test - Implying timezeon", function() {
+    
+        var text = 'Sat Nov 05 1994 22:45:30 GMT+0900 (JST)';
+        var result = chrono.parse(text)[0];
+        var expected = new Date(text);
+        
+        expect(result.text).toBe(text);
+        expect(expected.getTime()).toBeCloseTo(result.start.date().getTime())
 
-    var text = 'Sat Nov 05 1994 22:45:30 GMT+0900 (JST)';
-    var result = chrono.parse(text)[0];
-    var expected = new Date(text);
-
-    expect(result.text).toBe(text);
-    expect(expected.getTime()).toBeCloseTo(result.start.date().getTime());
-
-    var impliedResult = chrono.parse('Sat Nov 05 1994 22:45:30')[0];
-    impliedResult.start.imply('timezoneOffset', 540);
+        var impliedResult = chrono.parse('Sat Nov 05 1994 22:45:30')[0];
+        impliedResult.start.imply('timezoneOffset', 540);
 
-    expect(expected.getTime()).toBeCloseTo(impliedResult.start.date().getTime());
+        expect(expected.getTime()).toBeCloseTo(impliedResult.start.date().getTime());
 });
 
-test('Test - Random text', function() {
-
-    testSingleCase(chrono, 'Adam <Adam@supercalendar.com> написал(а):\nThe date is 02.07.2013', new Date(2013,5,22,3,33), (result, text) => {
+test('Test - Random text', function() { 
 
-        expect(result.text).toBe('02.07.2013');
-    });
+    var text = "Adam <Adam@supercalendar.com> написал(а):\nThe date is 02.07.2013";
+    var result = chrono.parse(text, new Date(2013,5,22,3,33))[0];
+    expect(result.text).toBe('02.07.2013')
 
     var text = "174 November 1,2001- March 31,2002";
     var results = chrono.parse(text);
-    expect(results.length).toBe(1);
-    expect(results[0].text).toBe('November 1,2001- March 31,2002');
+    expect(results.length).toBe(1)
+    expect(results[0].text).toBe('November 1,2001- March 31,2002')
 
 
-    var text = "...Thursday, December 15, 2011 Best Available Rate ";
+    var text = "...Thursday, December 15, 2011 Best Available Rate "
     var results = chrono.parse(text);
-    expect(results.length).toBe(1);
-    expect(results[0].start.get('year')).toBe(2011);
+    expect(results.length).toBe(1)
+    expect(results[0].start.get('year')).toBe(2011)
 
-
-    var text = "SUN 15SEP 11:05 AM - 12:50 PM";
+    
+    var text = "SUN 15SEP 11:05 AM - 12:50 PM"
     var results = chrono.parse(text);
-    expect(results.length).toBe(1);
-    expect(results[0].text.length).toBe(29);
-
-    var text = "SUN 15SEP 11:05 AM – 12:50 PM";
+    expect(results.length).toBe(1)
+    expect(results[0].text.length).toBe(29)
+	
+    var text = "SUN 15SEP 11:05 AM – 12:50 PM"
     var results = chrono.parse(text);
-    expect(results.length).toBe(1);
-    expect(results[0].end).not.toBeNull();
-
-    var text = "FRI 13SEP 1:29 PM - FRI 13SEP 3:29 PM";
+    expect(results.length).toBe(1)
+    expect(results[0].end).not.toBeNull()
+    
+    var text = "FRI 13SEP 1:29 PM - FRI 13SEP 3:29 PM"
     var results = chrono.parse(text);
-    expect(results.length).toBe(1);
-    expect(results[0].start.get('hour')).toBe(13);
-    expect(results[0].end.get('hour')).toBe(15);
+    expect(results.length).toBe(1)
+    expect(results[0].start.get('hour')).toBe(13)
+    expect(results[0].end.get('hour')).toBe(15)
 
-    var text = "9:00 AM to 5:00 PM, Tuesday, 20 May 2013";
+    var text = "9:00 AM to 5:00 PM, Tuesday, 20 May 2013"
     var results = chrono.parse(text);
-    expect(results.length).toBe(1);
-    expect(results[0].start.get('hour')).toBe(9);
-    expect(results[0].end.get('hour')).toBe(17);
-    expect(results[0].end.get('meridiem')).toBe(1);
+    expect(results.length).toBe(1)
+    expect(results[0].start.get('hour')).toBe(9)
+    expect(results[0].end.get('hour')).toBe(17)
+    expect(results[0].end.get('meridiem')).toBe(1)
 
 
-    expect(results[0].start).toBeDate(new Date(2013, 4, 20, 9, 0));
+    var resultDate = results[0].start.date();
+    var expectDate = new Date(2013, 4, 20, 9, 0);
+    expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    
+    var resultDate = results[0].end.date();
+    var expectDate = new Date(2013, 4, 20, 17, 0);
+    expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
 
-    expect(results[0].end).toBeDate(new Date(2013, 4, 20, 17, 0));
-
-    var text = "2014-07-07T04:00:00Z";
+    var text = "2014-07-07T04:00:00Z"
     var results = chrono.parse(text);
 
-    expect(results.length).toBe(1);
-    expect(results[0].text).toBe('2014-07-07T04:00:00Z');
+    expect(results.length).toBe(1)
+    expect(results[0].text).toBe('2014-07-07T04:00:00Z')
 
 
     var text = "1.5.3 - 2015-09-24";
     var results = chrono.parse(text);
 
-    expect(results.length).toBe(1);
-    expect(results[0].text).toBe('2015-09-24');
+    expect(results.length).toBe(1)
+    expect(results[0].text).toBe('2015-09-24')
 
 
     var text = "1.5.30 - 2015-09-24";
     var results = chrono.parse(text);
 
-    expect(results.length).toBe(1);
-    expect(results[0].text).toBe('2015-09-24');
+    expect(results.length).toBe(1)
+    expect(results[0].text).toBe('2015-09-24')
 
 
     var text = "1.50.30 - 2015-09-24";
     var results = chrono.parse(text);
 
-    expect(results.length).toBe(1);
-    expect(results[0].text).toBe('2015-09-24');
+    expect(results.length).toBe(1)
+    expect(results[0].text).toBe('2015-09-24')
 
     var text = "Monday afternoon to last night";
     var results = chrono.parse(text, new Date(2017, 7-1, 7));
@@ -158,62 +160,89 @@ test('Test - Random text', function() {
     expect(results[0].text).toBe('from 10am to now');
     expect(results[0].end.get('hour')).toBe(15);
     expect(results[0].end.get('minute')).toBe(0);
-});
+})
 
 test("Test - Random non-date patterns", function() {
 
-    testUnexpectedResult(chrono, ' 3');
+    var text = ' 3'
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono, '       1');
+    var text = '       1'
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono, '  11 ');
+    var text = '  11 '
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono, ' 0.5 ');
+    var text = ' 0.5 '
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono, ' 35.49 ');
+    var text = ' 35.49 '
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono, '12.53%');
+    var text = '12.53%'
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono, '6358fe2310> *5.0* / 5 Outstanding');
+    var text = "6358fe2310> *5.0* / 5 Outstanding";
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono, '6358fe2310> *1.5* / 5 Outstanding');
+    var text = "6358fe2310> *1.5* / 5 Outstanding";
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono, 'Total: $1,194.09 [image: View Reservation');
+    var text = "Total: $1,194.09 [image: View Reservation";
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono, 'Version: 1.1.3');
+    var text = "Version: 1.1.3";
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono, 'Version: 1.1.30');
+    var text = "Version: 1.1.30";
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0)
+
+    var text = "Version: 1.10.30";
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono, 'Version: 1.10.30');
 });
 
 
 test("Test - Wikipedia Texts", function() {
-
-    const text = 'October 7, 2011, of which details were not revealed out of respect to Jobs\'s family.[239] Apple announced on the same day that they had no plans for a public service, but were encouraging "well-wishers" to send their remembrance messages to an email address created to receive such messages.[240] Sunday, October 16, 2011';
-    const results = chrono.parse(text, new Date(2012,7,10));
-
-    expect(results.length).toBe(2);
-
-    {
-        const result = results[0];
+    
+    var text = 'October 7, 2011, of which details were not revealed out of respect to Jobs\'s family.[239] Apple announced on the same day that they had no plans for a public service, but were encouraging "well-wishers" to send their remembrance messages to an email address created to receive such messages.[240] Sunday, October 16, 2011';
+    var results = chrono.parse(text, new Date(2012,7,10));
+    
+    expect(results.length).toBe(2)
+    expect(results.length).toBe(2)
+
+    var result = results[0];
+    if(result){
         expect(result.start.get('year')).toBe(2011);
         expect(result.start.get('month')).toBe(10);
         expect(result.start.get('day')  ).toBe(7);
 
-        expect(result.index).toBe(0);
-        expect(result.text).toBe('October 7, 2011');
+        expect(result.index).toBe(0)
+        expect(result.text).toBe('October 7, 2011')
     }
-
-    {
-        const result = results[1];
+    
+    var result = results[1];
+    if(result){
         expect(result.start.get('year')).toBe(2011);
         expect(result.start.get('month')).toBe(10);
         expect(result.start.get('day')  ).toBe(16);
 
-        expect(result.index).toBe(297);
-        expect(result.text).toBe('Sunday, October 16, 2011');
+        expect(result.index).toBe(297)
+        expect(result.text).toBe('Sunday, October 16, 2011')
     }
+    
 });