chrono-node - npm Package Compare versions

Comparing version 1.2.1 to 1.2.2

bower.json

 {
   "name": "chrono",
   "main": "chrono.js",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "homepage": "https://github.com/wanasit/chrono",
@@ -6,0 +6,0 @@ "authors": [

package.json

@@ -10,3 +10,3 @@ {
   "license": "MIT",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "directories": {
@@ -13,0 +13,0 @@ "source": "./src",

src/parsers/EN/ENDeadlineFormatParser.js

@@ -9,9 +9,24 @@ /*
 var ParsedResult = require('../../result').ParsedResult;
+var util  = require('../../utils/EN');
 
-var PATTERN = /(\W|^)(within|in)\s*([0-9]+|an?|half(?:\s*an?)?)\s*(minutes?|hours?|days?)\s*(?=(?:\W|$))/i;
+var PATTERN = new RegExp('(\\W|^)' +
+    '(within|in)\\s*' +
+    '('+ util.INTEGER_WORDS_PATTERN + '|[0-9]+|an?(?:\\s*few)?|half(?:\\s*an?)?)\\s*' +
+    '(seconds?|minutes?|hours?|days?|weeks?|months?|years?)\\s*' +
+    '(?=\\W|$)', 'i'
+);
 
+var STRICT_PATTERN = new RegExp('(\\W|^)' +
+    '(within|in)\\s*' +
+    '('+ util.INTEGER_WORDS_PATTERN + '|[0-9]+|an?)\\s*' +
+    '(seconds?|minutes?|hours?|days?)\\s*' +
+    '(?=\\W|$)', 'i'
+);
+
 exports.Parser = function ENDeadlineFormatParser(){
     Parser.apply(this, arguments);
 
-    this.pattern = function() { return PATTERN; }
+    this.pattern = function() {
+        return this.isStrictMode()? STRICT_PATTERN : PATTERN;
+    };
 
@@ -27,8 +42,12 @@ this.extract = function(text, ref, match, opt){
             text: text,
-            ref: ref,
+            ref: ref
         });
 
         var num = match[3];
-        if (num === 'a' || num === 'an'){
+        if (util.INTEGER_WORDS[num] !== undefined) {
+            num = util.INTEGER_WORDS[num];
+        } else if (num === 'a' || num === 'an'){
             num = 1;
+        } else if (num.match(/few/)){
+            num = 3;
         } else if (num.match(/half/)) {
@@ -41,5 +60,14 @@ num = 0.5;
         var date = moment(ref);
-        if (match[4].match(/day/)) {
-            date.add(num, 'd');
+        if (match[4].match(/day|week|month|year/)) {
 
+            if (match[4].match(/day/)) {
+                date.add(num, 'd');
+            } else if (match[4].match(/week/)) {
+                date.add(num * 7, 'd');
+            } else if (match[4].match(/month/)) {
+                date.add(num, 'month');
+            } else if (match[4].match(/year/)) {
+                date.add(num, 'year');
+            }
+
             result.start.assign('year', date.year());
@@ -51,3 +79,2 @@ result.start.assign('month', date.month() + 1);
 
-
         if (match[4].match(/hour/)) {
@@ -60,2 +87,6 @@
             date.add(num, 'minute');
+
+        } else if (match[4].match(/second/)) {
+
+            date.add(num, 'second');
         }
@@ -68,5 +99,6 @@
         result.start.assign('minute', date.minute());
+        result.start.assign('second', date.second());
         result.tags['ENDeadlineFormatParser'] = true;
         return result;
     };
-}
+};

src/parsers/EN/ENMonthNameLittleEndianParser.js

@@ -10,7 +10,3 @@ /*
 var ParsedResult = require('../../result').ParsedResult;
-
 var util  = require('../../utils/EN');
-
-var DAYS_OFFSET = { 'sunday': 0, 'sun': 0, 'monday': 1, 'mon': 1,'tuesday': 2, 'tue':2, 'wednesday': 3, 'wed': 3,
-        'thursday': 4, 'thur': 4, 'thu': 4,'friday': 5, 'fri': 5,'saturday': 6, 'sat': 6,}
     
@@ -17,0 +13,0 @@ var PATTERN = new RegExp('(\\W|^)' +

src/parsers/EN/ENMonthNameMiddleEndianParser.js

@@ -21,7 +21,3 @@ /*
 var ParsedResult = require('../../result').ParsedResult;
-
 var util  = require('../../utils/EN');
-
-var DAYS_OFFSET = { 'sunday': 0, 'sun': 0, 'monday': 1, 'mon': 1,'tuesday': 2, 'tue':2, 'wednesday': 3, 'wed': 3,
-    'thursday': 4, 'thur': 4, 'thu': 4,'friday': 5, 'fri': 5,'saturday': 6, 'sat': 6,}
     
@@ -28,0 +24,0 @@ var PATTERN = new RegExp('(\\W|^)' +

src/parsers/EN/ENMonthNameParser.js

@@ -15,6 +15,4 @@ /*
 var ParsedResult = require('../../result').ParsedResult;
-
 var util  = require('../../utils/EN');
 
-    
 var PATTERN = new RegExp('(^|\\D\\s+|[^\\w\\s])' +
@@ -28,3 +26,2 @@ '(Jan\\.?|January|Feb\\.?|February|Mar\\.?|March|Apr\\.?|April|May\\.?|Jun\\.?|June|Jul\\.?|July|Aug\\.?|August|Sep\\.?|Sept\\.?|September|Oct\\.?|October|Nov\\.?|November|Dec\\.?|December)' +
 
-
 var MONTH_NAME_GROUP = 2;
@@ -31,0 +28,0 @@ var YEAR_GROUP = 3;

src/parsers/EN/ENTimeAgoFormatParser.js

@@ -9,6 +9,18 @@ /*
 var ParsedResult = require('../../result').ParsedResult;
+var util  = require('../../utils/EN');
 
-var PATTERN = /(\W|^)(?:within\s*)?([0-9]+|an?|half(?:\s*an?)?)\s*(minutes?|hours?|weeks?|days?|months?|years?)\s*(?:ago|before|earlier)(?=(?:\W|$))/i;
-var STRICT_PATTERN = /(\W|^)(?:within\s*)?([0-9]+|an?)\s*(minutes?|hours?|days?)\s*ago(?=(?:\W|$))/i;
+var PATTERN = new RegExp('' +
+    '(\\W|^)' +
+    '(?:within\\s*)?' +
+    '(' + util.INTEGER_WORDS_PATTERN + '|[0-9]+|an?(?:\\s*few)?|half(?:\\s*an?)?)\\s*' +
+    '(seconds?|minutes?|hours?|weeks?|days?|months?|years?)\\s*' +
+    '(?:ago|before|earlier)(?=(?:\\W|$))', 'i');
 
+var STRICT_PATTERN = new RegExp('' +
+    '(\\W|^)' +
+    '(?:within\\s*)?' +
+    '([0-9]+|an?)\\s*' +
+    '(seconds?|minutes?|hours?|days?)\\s*' +
+    'ago(?=(?:\\W|$))', 'i');
+
 exports.Parser = function ENTimeAgoFormatParser(){
@@ -19,3 +31,3 @@ Parser.apply(this, arguments);
         return this.isStrictMode()? STRICT_PATTERN : PATTERN;
-    }
+    };
 
@@ -33,8 +45,12 @@ this.extract = function(text, ref, match, opt){
             text: text,
-            ref: ref,
+            ref: ref
         });
 
         var num = match[2];
-        if(num === 'a' || num === 'an'){
+        if (util.INTEGER_WORDS[num] !== undefined) {
+            num = util.INTEGER_WORDS[num];
+        } else if(num === 'a' || num === 'an'){
             num = 1;
+        } else if (num.match(/few/)) {
+            num = 3;
         } else if (num.match(/half/)) {
@@ -48,3 +64,3 @@ num = 0.5;
 
-        if (match[3].match(/hour/) || match[3].match(/minute/)) {
+        if (match[3].match(/hour|minute|second/)) {
             if (match[3].match(/hour/)) {
@@ -57,2 +73,6 @@
                 date.add(-num, 'minute');
+
+            } else if (match[3].match(/second/)) {
+
+                date.add(-num, 'second');
             }
@@ -65,2 +85,3 @@
             result.start.assign('minute', date.minute());
+            result.start.assign('second', date.second());
             result.tags['ENTimeAgoFormatParser'] = true;
@@ -67,0 +88,0 @@ return result;

src/utils/EN.js

@@ -16,3 +16,4 @@ exports.WEEKDAY_OFFSET = {
     'saturday': 6, 
-    'sat': 6,}
+    'sat': 6
+};
     
@@ -55,3 +56,19 @@ exports.MONTH_OFFSET = {
     'dec': 12,
-    'dec.': 12,
-}
+    'dec.': 12
+};
+
+exports.INTEGER_WORDS_PATTERN = '(?:one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve)';
+exports.INTEGER_WORDS = {
+    'one' : 1,
+    'two' : 2,
+    'three' : 3,
+    'four' : 4,
+    'five' : 5,
+    'six' : 6,
+    'seven' : 7,
+    'eight' : 8,
+    'nine' : 9,
+    'ten' : 10,
+    'eleven' : 11,
+    'twelve' : 12
+};

test/test_en_deadline.js

@@ -6,13 +6,13 @@
     var results = chrono.parse(text, new Date(2012,7,10));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 24, 'Wrong index')
-        ok(result.text == 'in 5 days', result.text )
+        ok(result.index == 24, 'Wrong index');
+        ok(result.text == 'in 5 days', result.text );
 
-        ok(result.start, JSON.stringify(result.start) )
-        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) )
-        ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('day') == 15, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.start, JSON.stringify(result.start) );
+        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) );
+        ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('day') == 15, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
@@ -24,15 +24,37 @@ var resultDate = result.start.date();
 
+
+
+    var text = "we have to do something in five days.";
+    var results = chrono.parse(text, new Date(2012,7,10));
+    ok(results.length == 1, JSON.stringify( results ) );
+
+    var result = results[0];
+    if(result){
+        ok(result.index == 24, 'Wrong index');
+        ok(result.text == 'in five days', result.text );
+
+        ok(result.start, JSON.stringify(result.start) );
+        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) );
+        ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('day') == 15, 'Test Result - (Day) ' + JSON.stringify(result.start) );
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8-1, 15, 12);
+        ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate)
+    }
+
+
     var text = "we have to do something within 10 day";
     var results = chrono.parse(text, new Date(2012,7,10));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 24, 'Wrong index')
-        ok(result.text == 'within 10 day', result.text )
+        ok(result.index == 24, 'Wrong index');
+        ok(result.text == 'within 10 day', result.text );
 
-        ok(result.start, JSON.stringify(result.start) )
-        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) )
-        ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('day') == 20, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.start, JSON.stringify(result.start) );
+        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) );
+        ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('day') == 20, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
@@ -47,8 +69,8 @@ var resultDate = result.start.date();
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == 'in 5 minutes', result.text )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'in 5 minutes', result.text );
 
@@ -62,8 +84,8 @@ var resultDate = result.start.date();
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == 'within 1 hour', result.text )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'within 1 hour', result.text );
 
@@ -77,8 +99,8 @@ var resultDate = result.start.date();
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == 'In 5 minutes', result.text )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'In 5 minutes', result.text );
 
@@ -90,10 +112,11 @@ var resultDate = result.start.date();
 
+
     var text = "In 5 minutes A car need to move";
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == 'In 5 minutes', result.text )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'In 5 minutes', result.text );
 
@@ -105,10 +128,26 @@ var resultDate = result.start.date();
 
+
+    var text = "In 5 seconds A car need to move";
+    var results = chrono.parse(text, new Date(2012,7, 10, 12, 14));
+    ok(results.length == 1, JSON.stringify( results ) );
+
+    var result = results[0];
+    if(result){
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'In 5 seconds', result.text );
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12, 14, 5);
+        ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate)
+    }
+
+
     var text = "within half an hour";
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == 'within half an hour', result.text )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'within half an hour', result.text );
 
@@ -119,2 +158,80 @@ var resultDate = result.start.date();
     }
+
+
+    var text = "within two weeks";
+    var results = chrono.parse(text, new Date(2012, 7, 10, 12, 14));
+    ok(results.length == 1, JSON.stringify( results ) );
+
+    var result = results[0];
+    if(result){
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'within two weeks', result.text );
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 24, 12);
+        ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate)
+    }
+
+
+    var text = "within a month";
+    var results = chrono.parse(text, new Date(2012, 7, 10, 12, 14));
+    ok(results.length == 1, JSON.stringify( results ) );
+
+    var result = results[0];
+    if(result){
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'within a month', result.text );
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 8, 10, 12);
+        ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate)
+    }
+
+
+    var text = "within a few months";
+    var results = chrono.parse(text, new Date(2012, 7, 10, 12, 14));
+    ok(results.length == 1, JSON.stringify( results ) );
+
+    var result = results[0];
+    if(result){
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'within a few months', result.text );
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 10, 10, 12);
+        ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate)
+    }
+
+
+    var text = "within one year";
+    var results = chrono.parse(text, new Date(2012, 7, 10, 12, 14));
+    ok(results.length == 1, JSON.stringify( results ) );
+
+    var result = results[0];
+    if(result){
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'within one year', result.text );
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2013, 7, 10, 12);
+        ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate)
+    }
 });
+
+
+test("Test - Single Expression (Strict)", function() {
+
+    var text = "within one year";
+    var results = chrono.strict.parse(text, new Date(2012,7,10,12,14));
+    ok(results.length == 0, JSON.stringify( results ) );
+
+
+    var text = "within a few months";
+    var results = chrono.strict.parse(text, new Date(2012, 8-1, 3));
+    ok(results.length == 0, JSON.stringify( results ) )
+
+
+    var text = "within a few days";
+    var results = chrono.strict.parse(text, new Date(2012, 8-1, 3));
+    ok(results.length == 0, JSON.stringify( results ) )
+});

test/test_en_time_ago.js

@@ -6,13 +6,13 @@
     var results = chrono.parse(text, new Date(2012,7,10));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.start, JSON.stringify(result.start) )
-        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) )
-        ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('day') == 5, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.start, JSON.stringify(result.start) );
+        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) );
+        ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('day') == 5, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == '5 days ago', result.text )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == '5 days ago', result.text );
 
@@ -26,13 +26,13 @@ var resultDate = result.start.date();
     var results = chrono.parse(text, new Date(2012,7,10));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.start, JSON.stringify(result.start) )
-        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) )
-        ok(result.start.get('month') == 7, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('day') == 31, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.start, JSON.stringify(result.start) );
+        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) );
+        ok(result.start.get('month') == 7, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('day') == 31, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == '10 days ago', result.text )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == '10 days ago', result.text );
 
@@ -47,10 +47,10 @@ var resultDate = result.start.date();
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == '15 minute ago', result.text )
-        ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('minute') == 59, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == '15 minute ago', result.text );
+        ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('minute') == 59, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
@@ -64,10 +64,10 @@ var resultDate = result.start.date();
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == '15 minute earlier', result.text )
-        ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('minute') == 59, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == '15 minute earlier', result.text );
+        ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('minute') == 59, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
@@ -81,10 +81,10 @@ var resultDate = result.start.date();
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == '15 minute before', result.text )
-        ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('minute') == 59, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == '15 minute before', result.text );
+        ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('minute') == 59, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
@@ -98,10 +98,10 @@ var resultDate = result.start.date();
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 3, 'Wrong index')
-        ok(result.text == '12 hours ago', result.text )
-        ok(result.start.get('hour') == 0, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('minute') == 14, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.index == 3, 'Wrong index');
+        ok(result.text == '12 hours ago', result.text );
+        ok(result.start.get('hour') == 0, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('minute') == 14, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
@@ -115,10 +115,10 @@ var resultDate = result.start.date();
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 3, 'Wrong index')
-        ok(result.text == 'half an hour ago', result.text )
-        ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('minute') == 44, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.index == 3, 'Wrong index');
+        ok(result.text == 'half an hour ago', result.text );
+        ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('minute') == 44, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
@@ -133,10 +133,10 @@ var resultDate = result.start.date();
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == '12 hours ago', result.text )
-        ok(result.start.get('hour') == 0, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('minute') == 14, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == '12 hours ago', result.text );
+        ok(result.start.get('hour') == 0, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('minute') == 14, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
@@ -147,2 +147,39 @@ var resultDate = result.start.date();
     }
+
+
+    var text = "12 seconds ago I did something";
+    var results = chrono.parse(text, new Date(2012, 7, 10, 12, 14));
+    ok(results.length == 1, JSON.stringify( results ) );
+
+    var result = results[0];
+    if(result){
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == '12 seconds ago', result.text );
+        ok(result.start.get('hour') == 12, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) );
+        ok(result.start.get('second') == 48, 'Test Result - (Day) ' + JSON.stringify(result.start) );
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12, 13, 48);
+        ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate)
+    }
+
+
+    var text = "three seconds ago I did something";
+    var results = chrono.parse(text, new Date(2012, 7, 10, 12, 14));
+    ok(results.length == 1, JSON.stringify( results ) );
+
+    var result = results[0];
+    if(result){
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'three seconds ago', result.text );
+        ok(result.start.get('hour') == 12, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) );
+        ok(result.start.get('second') == 57, 'Test Result - (Day) ' + JSON.stringify(result.start) );
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 12, 13, 57);
+        ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate)
+    }
+
 });
@@ -155,13 +192,13 @@
     var results = chrono.parse(text, new Date(2012, 8-1,10));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.start, JSON.stringify(result.start) )
-        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) )
-        ok(result.start.get('month') == 3, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.start, JSON.stringify(result.start) );
+        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) );
+        ok(result.start.get('month') == 3, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == '5 months ago', result.text )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == '5 months ago', result.text );
 
@@ -175,13 +212,13 @@ var resultDate = result.start.date();
     var results = chrono.parse(text, new Date(2012, 8-1,10));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.start, JSON.stringify(result.start) )
-        ok(result.start.get('year') == 2007, 'Test Result - (Year) ' + JSON.stringify(result.start) )
-        ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.start, JSON.stringify(result.start) );
+        ok(result.start.get('year') == 2007, 'Test Result - (Year) ' + JSON.stringify(result.start) );
+        ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == '5 years ago', result.text )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == '5 years ago', result.text );
 
@@ -196,13 +233,13 @@ var resultDate = result.start.date();
     var results = chrono.parse(text, new Date(2012, 8-1, 3));
-    ok(results.length == 1, JSON.stringify( results ) )
+    ok(results.length == 1, JSON.stringify( results ) );
 
     var result = results[0];
     if(result){
-        ok(result.start, JSON.stringify(result.start) )
-        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) )
-        ok(result.start.get('month') == 7, 'Test Result - (Month) ' + JSON.stringify(result.start) )
-        ok(result.start.get('day') == 27, 'Test Result - (Day) ' + JSON.stringify(result.start) )
+        ok(result.start, JSON.stringify(result.start) );
+        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) );
+        ok(result.start.get('month') == 7, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('day') == 27, 'Test Result - (Day) ' + JSON.stringify(result.start) );
 
-        ok(result.index == 0, 'Wrong index')
-        ok(result.text == 'a week ago', result.text )
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'a week ago', result.text );
 
@@ -213,2 +250,22 @@ var resultDate = result.start.date();
     }
+
+
+    var text = "a few days ago, we did something";
+    var results = chrono.parse(text, new Date(2012, 8-1, 3));
+    ok(results.length == 1, JSON.stringify( results ) );
+
+    var result = results[0];
+    if(result){
+        ok(result.start, JSON.stringify(result.start) );
+        ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) );
+        ok(result.start.get('month') == 7, 'Test Result - (Month) ' + JSON.stringify(result.start) );
+        ok(result.start.get('day') == 31, 'Test Result - (Day) ' + JSON.stringify(result.start) );
+
+        ok(result.index == 0, 'Wrong index');
+        ok(result.text == 'a few days ago', result.text );
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7-1, 31, 12);
+        ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate)
+    }
 });
@@ -220,3 +277,3 @@
     var results = chrono.strict.parse(text, new Date(2012,7,10,12,14));
-    ok(results.length == 0, JSON.stringify( results ) )
+    ok(results.length == 0, JSON.stringify( results ) );
 
@@ -226,2 +283,2 @@ var text = "a week ago, we did something";
     ok(results.length == 0, JSON.stringify( results ) )
-})
+});

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

1418966

decreased by-24.32%

Number of package files

77

decreased by-1.28%

Lines of code

14564

decreased by-43%

No dependency changes