chrono-node 1.4.7 → 1.4.9

package/test/pt/pt_casual.test.js

@@ -1,191 +1,257 @@
-import * as chrono from '../../src/chrono';
-import { testSingleCase, testUnexpectedResult } from '../test_util';
+var chrono = require('../../src/chrono');
 
 test("Test - Single Expression", function() {
 
 
-    testSingleCase(chrono.pt, 'O prazo é agora', new Date(2012, 7, 10, 8, 9, 10, 11), (result) => {
-        expect(result.index).toBe(10);
-        expect(result.text).toBe('agora');
+    var text = "O prazo é agora";
+    var results = chrono.pt.parse(text, new Date(2012, 7, 10, 8, 9, 10, 11));
+    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(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.pt, 'O prazo é hoje', new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(10);
-        expect(result.text).toBe('hoje');
-
-        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));
-    });
-
-
-    testSingleCase(chrono.pt, 'O prazo é Amanhã', new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(10);
-        expect(result.text).toBe('Amanhã');
-
-        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));
-    });
-
-    testSingleCase(chrono.pt, 'O prazo é Amanhã', new Date(2012, 7, 10, 1), (result) => {
-        expect(result.start).toBeDate(new Date(2012, 7, 10, 12));
-    });
-
-
-    testSingleCase(chrono.pt, 'O prazo foi ontem', new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(12);
-        expect(result.text).toBe('ontem');
-
-        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.pt, 'O prazo foi ontem à noite ', new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(12);
-        expect(result.text).toBe('ontem à noite');
-
-        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(22);
-
-        expect(result.start).toBeDate(new Date(2012, 7, 9, 22));
-    });
-
-
-    testSingleCase(chrono.pt, 'O prazo foi esta manhã ', new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(12);
-        expect(result.text).toBe('esta manhã');
-
-        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));
-    });
-
-
-    testSingleCase(chrono.pt, 'O prazo foi esta tarde ', new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(12);
-        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));
-    });
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(10)
+        expect(result.text).toBe('agora')
+
+        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())
+    }
+
+
+    var text = "O prazo é hoje";
+    var results = chrono.pt.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(10)
+        expect(result.text).toBe('hoje')
+
+        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)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+
+    var text = "O prazo é Amanhã";
+    var results = chrono.pt.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(10)
+        expect(result.text).toBe('Amanhã')
+
+        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)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 11, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "O prazo é Amanhã";
+    var results = chrono.pt.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 = "O prazo foi ontem";
+    var results = chrono.pt.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(12)
+        expect(result.text).toBe('ontem')
+
+        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)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 9, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+
+    var text = "O prazo foi ontem à noite ";
+    var results = chrono.pt.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(12)
+        expect(result.text).toBe('ontem à noite')
+
+        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(22)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 9, 22);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+
+    var text = "O prazo foi esta manhã ";
+    var results = chrono.pt.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(12)
+        expect(result.text).toBe('esta manhã')
+
+        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())
+    }
+
+
+    var text = "O prazo foi esta tarde ";
+    var results = chrono.pt.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(12)
+        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())
+    }
 });
 
 
 test("Test - Combined Expression", function() {
 
 
-    testSingleCase(chrono.pt, 'O prazo é hoje às 5PM', new Date(2012, 7, 10, 12), (result) => {
-        expect(result.index).toBe(10);
-        expect(result.text).toBe('hoje às 5PM');
+    var text = "O prazo é hoje às 5PM";
+    var results = chrono.pt.parse(text, new Date(2012, 7, 10, 12));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(10)
+        expect(result.text).toBe('hoje às 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).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));
-    });
+        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.pt, 'esta noite', new Date(2012, 1-1, 1, 12), (result, text) => {
+    var text = "esta noite";
+    var result = chrono.pt.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('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 = "esta noite 8pm";
+    var result = chrono.pt.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.pt, 'esta noite 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);
-    });
+    var text = "esta noite at 8"; // TODO
+    var result = chrono.pt.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.pt, 'esta noite at 8', new Date(2012, 1-1, 1, 12), (result, text) => {
+    var text = "quinta";
+    var result = chrono.pt.parse(text)[0];
+    expect(result.text).toBe(text)
+    expect(result.start.get('weekday')).toBe(4)
 
-        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.pt, 'quinta', (result, text) => {
-
-        expect(result.text).toBe(text);
-        expect(result.start.get('weekday')).toBe(4);
-    });
-
-
-    testSingleCase(chrono.pt, 'sexta', (result, text) => {
-
-        expect(result.text).toBe(text);
-        expect(result.start.get('weekday')).toBe(5);
-    });
-
-});
+    var text = "sexta";
+    var result = chrono.pt.parse(text)[0];
+    expect(result.text).toBe(text)
+    expect(result.start.get('weekday')).toBe(5)
+})
 
 
 test('Test - Random negative text', function() {
 
-    testUnexpectedResult(chrono.pt, 'naohoje');
+    var text = "naohoje";
+    var results = chrono.pt.parse(text);
+    expect(results.length).toBe(0)
 
 
-    testUnexpectedResult(chrono.pt, 'hyamanhã');
+    var text = "hyamanhã";
+    var results = chrono.pt.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono.pt, 'xontem');
+    var text = "xontem";
+    var results = chrono.pt.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono.pt, 'porhora');
+    var text = "porhora";
+    var results = chrono.pt.parse(text);
+    expect(results.length).toBe(0)
 
-    testUnexpectedResult(chrono.pt, 'agoraxsd')
+    var text = "agoraxsd";
+    var results = chrono.pt.parse(text);
+    expect(results.length).toBe(0)
 
-});
+})

package/test/pt/pt_dash.test.js

@@ -1,12 +1,13 @@
-import * as chrono from '../../src/chrono';
-import { testSingleCase } from '../test_util';
+var chrono = require('../../src/chrono');
 
 test("Test - Should handle dayname dd-mm-yy", function() {
-
-    testSingleCase(chrono.strict, 'Sexta-feira 30-12-16', new Date(2012,7,10))
+  var text = "Sexta-feira 30-12-16";
+  var results = chrono.strict.parse(text, new Date(2012,7,10));
+  expect(results.length).toBe(1)
 });
 
 test("Test - Should handle 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/pt/pt_deadline.test.js

@@ -1,9 +1,13 @@
-import * as chrono from '../../src/chrono';
-import { testSingleCase } from '../test_util';
+var chrono = require('../../src/chrono');
 
 test("Test - Single Expression", function() {
 
-    testSingleCase(chrono, 'nós temos que fazer algo em 5 dias.', new Date(2012,7,10), (result) => {
+    var text = "nós temos que fazer algo em 5 dias.";
+    var results = chrono.parse(text, new Date(2012,7,10));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(25)
         expect(result.text).toBe('em 5 dias')
 
@@ -12,10 +16,17 @@ test("Test - Single Expression", function() {
         expect(result.start.get('month')).toBe(8)
         expect(result.start.get('day')).toBe(15)
 
-        expect(result.start).toBeDate(new Date(2012, 8-1, 15, 12));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8-1, 15, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "nós temos que fazer algo dentro de 10 dias";
+    var results = chrono.parse(text, new Date(2012,7,10));
+    expect(results.length).toBe(1)
 
-    testSingleCase(chrono, 'nós temos que fazer algo dentro de 10 dias', new Date(2012,7,10), (result) => {
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(25)
         expect(result.text).toBe('dentro de 10 dias')
 
@@ -24,28 +35,51 @@ test("Test - Single Expression", function() {
         expect(result.start.get('month')).toBe(8)
         expect(result.start.get('day')).toBe(20)
 
-        expect(result.start).toBeDate(new Date(2012, 8-1, 20, 12));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8-1, 20, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
 
+    var text = "em 5 minutos";
+    var results = chrono.parse(text, new Date(2012,7,10,12,14));
+    expect(results.length).toBe(1)
 
-    testSingleCase(chrono, 'em 5 minutos', new Date(2012,7,10,12,14), (result) => {
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(0)
         expect(result.text).toBe('em 5 minutos')
 
-        expect(result.start).toBeDate(new Date(2012,7,10,12,19));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012,7,10,12,19);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 
-    testSingleCase(chrono, 'em uma hora', new Date(2012,7,10,12,14), (result) => {
+    var text = "em uma 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('em uma hora')
 
-        expect(result.start).toBeDate(new Date(2012,7,10,13,14));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012,7,10,13,14);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "em meia hora";
+    var results = chrono.parse(text, new Date(2012,7,10,12,14));
+    expect(results.length).toBe(1)
 
-    testSingleCase(chrono, 'em meia hora', new Date(2012,7,10,12,14), (result) => {
+    var result = results[0];
+    if(result){
         expect(result.index).toBe(0)
         expect(result.text).toBe('em meia hora')
 
-        expect(result.start).toBeDate(new Date(2012,7,10,12,44));
-    });
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012,7,10,12,44);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 });