chrono-node 1.4.7 → 1.4.9

package/test/es/es_casual.test.js

@@ -1,108 +1,124 @@
 import * as chrono from '../../src/chrono';
-import { testSingleCase, testUnexpectedResult } from '../test_util';
+import { testSingleCase } from '../test_util';
 
 test("Test - Single Expression", function() {
 
 
     testSingleCase(chrono.es, "La fecha límite es ahora", new Date(2012, 7, 10, 8, 9, 10, 11), (result) => {
-        expect(result.index).toBe(19);
-        expect(result.text).toBe('ahora');
-
-        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));
+        expect(result.index).toBe(19)
+        expect(result.text).toBe('ahora')
+
+        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)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 8, 9, 10, 11);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
     testSingleCase(chrono.es, "La fecha límite es hoy", new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(19);
-        expect(result.text).toBe('hoy');
+        expect(result.index).toBe(19)
+        expect(result.text).toBe('hoy')
 
-        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, 7, 10, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
     testSingleCase(chrono.es, "La fecha límite es Mañana", new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(19);
-        expect(result.text).toBe('Mañana');
+        expect(result.index).toBe(19)
+        expect(result.text).toBe('Mañana')
 
-        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).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, 12));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 11, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
     testSingleCase(chrono.es, "La fecha límite es Mañana", new Date(2012, 7, 10, 1), (result) => {
-        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.es, "La fecha límite fue ayer", new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(20);
-        expect(result.text).toBe('ayer');
+        expect(result.index).toBe(20)
+        expect(result.text).toBe('ayer')
 
-        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).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));
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 9, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
     testSingleCase(chrono.es, "La fehca límite fue anoche ", new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(20);
-        expect(result.text).toBe('anoche');
-
-        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('hour')).toBe(0);
-
-        expect(result.start).toBeDate(new Date(2012, 7, 9, 0));
+        expect(result.index).toBe(20)
+        expect(result.text).toBe('anoche')
+
+        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('hour')).toBe(0)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 9, 0);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
     testSingleCase(chrono.es, "La fecha límite fue esta mañana ", new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(20);
-        expect(result.text).toBe('esta mañana');
-
-        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(6);
-
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 6));
+        expect(result.index).toBe(20)
+        expect(result.text).toBe('esta mañana')
+
+        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(6)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 6);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 
 
     testSingleCase(chrono.es, "La fecha límite fue esta tarde ", new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(20);
-        expect(result.text).toBe('esta tarde');
-
-        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(18);
-
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 18));
+        expect(result.index).toBe(20)
+        expect(result.text).toBe('esta tarde')
+
+        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(18)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 18);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 });
 
@@ -111,80 +127,87 @@ test("Test - Combined Expression", function() {
 
 
     testSingleCase(chrono.es, "La fecha límite es hoy 5PM", new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(19);
-        expect(result.text).toBe('hoy 5PM');
-
-        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(17);
-
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 17));
+        expect(result.index).toBe(19)
+        expect(result.text).toBe('hoy 5PM')
+
+        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(17)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 17);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     });
 });
 
 
 test('Test - Random text', function() {
 
-    testSingleCase(chrono.es, 'esta noche', 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.es, 'esta noche 8pm', 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.es, 'esta noche at 8', new Date(2012, 1-1, 1, 12), (result, text) => {
+    var text = "esta noche";
+    var result = chrono.es.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)
 
-        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 = "esta noche 8pm";
+    var result = chrono.es.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)
 
 
-    testSingleCase(chrono.es, 'jueves', (result, text) => {
+    var text = "esta noche at 8"; // TODO
+    var result = chrono.es.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)
 
-        expect(result.text).toBe(text);
-        expect(result.start.get('weekday')).toBe(4);
-    });
 
+    var text = "jueves";
+    var result = chrono.es.parse(text)[0];
+    expect(result.text).toBe(text)
+    expect(result.start.get('weekday')).toBe(4)
 
-    testSingleCase(chrono.es, 'viernes', (result, text) => {
 
-        expect(result.text).toBe(text);
-        expect(result.start.get('weekday')).toBe(5);
-    });
-});
+    var text = "viernes";
+    var result = chrono.es.parse(text)[0];
+    expect(result.text).toBe(text)
+    expect(result.start.get('weekday')).toBe(5)
+})
 
 
 test('Test - Random negative text', function() {
 
-    testUnexpectedResult(chrono.es, 'nohoy');
+    var text = "nohoy";
+    var results = chrono.es.parse(text);
+    expect(results.length).toBe(0)
 
 
-    testUnexpectedResult(chrono.es, 'hymañana');
+    var text = "hymañana";
+    var results = chrono.es.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono.es, 'xayer');
+    var text = "xayer";
+    var results = chrono.es.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono.es, 'porahora');
+    var text = "porahora";
+    var results = chrono.es.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono.es, 'ahoraxsd')
+    var text = "ahoraxsd";
+    var results = chrono.es.parse(text);
+    expect(results.length).toBe(0)
 
-});
+})

package/test/es/es_dash.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 - Should handle es dayname dd-mm-yy", function() {
-
-  testSingleCase(chrono.strict, 'Viernes 30-12-16', new Date(2012,7,10));
-
+  var text = "Viernes 30-12-16";
+  var results = chrono.strict.parse(text, new Date(2012,7,10));
+  expect(results.length).toBe(1)
 });
 
 test("Test - Should handle es dd-mm-yy", function() {
-
-  testSingleCase(chrono.strict, '30-12-16', new Date(2012,7,10));
-
+  var text = "30-12-16";
+  var results = chrono.strict.parse(text, new Date(2012,7,10));
+  expect(results.length).toBe(1)
 });

package/test/es/es_deadline.test.js

@@ -1,51 +1,85 @@
-import * as chrono from '../../src/chrono';
-import { testSingleCase } from '../test_util';
+var chrono = require('../../src/chrono');
 
 test("Test - Single Expression", function() {
 
-    testSingleCase(chrono, 'tenemos que hacer algo en 5 días.', new Date(2012,7,10), (result) => {
-        expect(result.index).toBe(23);
-        expect(result.text).toBe('en 5 días');
+    var text = "tenemos que hacer algo en 5 días.";
+    var results = chrono.parse(text, new Date(2012,7,10));
+    expect(results.length).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(15);
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(23)
+        expect(result.text).toBe('en 5 días')
 
-        expect(result.start).toBeDate(new Date(2012, 8-1, 15, 12));
-    });
+        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(15)
 
-    testSingleCase(chrono, 'tenemos que hacer algo dentro de 10 dias', new Date(2012,7,10), (result) => {
-        expect(result.index).toBe(23);
-        expect(result.text).toBe('dentro de 10 dias');
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8-1, 15, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 
-        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(20);
+    var text = "tenemos que hacer algo dentro de 10 dias";
+    var results = chrono.parse(text, new Date(2012,7,10));
+    expect(results.length).toBe(1)
 
-        expect(result.start).toBeDate(new Date(2012, 8-1, 20, 12));
-    });
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(23)
+        expect(result.text).toBe('dentro de 10 dias')
 
+        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(20)
 
-    testSingleCase(chrono, 'en 5 minutos', new Date(2012,7,10,12,14), (result) => {
-        expect(result.index).toBe(0);
-        expect(result.text).toBe('en 5 minutos');
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8-1, 20, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 
-        expect(result.start).toBeDate(new Date(2012,7,10,12,19));
-    });
 
-    testSingleCase(chrono, 'en una hora', new Date(2012,7,10,12,14), (result) => {
-        expect(result.index).toBe(0);
-        expect(result.text).toBe('en una hora');
+    var text = "en 5 minutos";
+    var results = chrono.parse(text, new Date(2012,7,10,12,14));
+    expect(results.length).toBe(1)
 
-        expect(result.start).toBeDate(new Date(2012,7,10,13,14));
-    });
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(0)
+        expect(result.text).toBe('en 5 minutos')
 
-    testSingleCase(chrono, 'en media hora', new Date(2012,7,10,12,14), (result) => {
-        expect(result.index).toBe(0);
-        expect(result.text).toBe('en media hora');
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012,7,10,12,19);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 
-        expect(result.start).toBeDate(new Date(2012,7,10,12,44));
-    });
+    var text = "en una hora";
+    var results = chrono.parse(text, new Date(2012,7,10,12,14));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(0)
+        expect(result.text).toBe('en una hora')
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012,7,10,13,14);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "en media hora";
+    var results = chrono.parse(text, new Date(2012,7,10,12,14));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(0)
+        expect(result.text).toBe('en media hora')
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012,7,10,12,44);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 });