chrono-node 1.3.5 → 1.4.4

package/src/parsers/{EN → en}/ENTimeExpressionParser.js

@@ -1,8 +1,4 @@
-/*
-
-*/
-
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 var ParsedComponents = require('../../result').ParsedComponents;
@@ -13,10 +9,10 @@ var FIRST_REG_PATTERN  = new RegExp("(^|\\s|T)" +
     "(?:" + 
         "(?:\\.|\\:|\\：)(\\d{1,2})" + 
         "(?:" + 
-            "(?:\\:|\\：)(\\d{2})" + 
+            "(?:\\:|\\：)(\\d{2})(?:\\.(\\d{1,6}))?" + 
         ")?" + 
     ")?" + 
-    "(?:\\s*(A\\.M\\.|P\\.M\\.|AM?|PM?))?" + 
+    "(?:\\s*(A\\.M\\.|P\\.M\\.|AM?|PM?|O\\W*CLOCK))?" + 
     "(?=\\W|$)", 'i');
 
 
@@ -26,16 +22,17 @@ var SECOND_REG_PATTERN = new RegExp("^\\s*" +
     "(?:" + 
         "(?:\\.|\\:|\\：)(\\d{1,2})" + 
         "(?:" + 
-            "(?:\\.|\\:|\\：)(\\d{1,2})" + 
+            "(?:\\.|\\:|\\：)(\\d{1,2})(?:\\.(\\d{1,6}))?" + 
         ")?" + 
     ")?" + 
-    "(?:\\s*(A\\.M\\.|P\\.M\\.|AM?|PM?))?" + 
+    "(?:\\s*(A\\.M\\.|P\\.M\\.|AM?|PM?|O\\W*CLOCK))?" + 
     "(?=\\W|$)", 'i');
 
 var HOUR_GROUP    = 2;
 var MINUTE_GROUP  = 3;
 var SECOND_GROUP  = 4;
-var AM_PM_HOUR_GROUP = 5;
+var MILLI_SECOND_GROUP  = 5;
+var AM_PM_HOUR_GROUP = 6;
 
 
 exports.Parser = function ENTimeExpressionParser(){
@@ -45,9 +42,9 @@ exports.Parser = function ENTimeExpressionParser(){
     
     this.extract = function(text, ref, match, opt){ 
         
-        // This pattern can be overlaped Ex. [12] AM, 1[2] AM
+        // This pattern can be overlapped Ex. [12] AM, 1[2] AM
         if (match.index > 0 && text[match.index-1].match(/\w/)) return null;
-        var refMoment = moment(ref);
+        var refMoment = dayjs(ref);
         var result = new ParsedResult();
         result.ref = ref;
         result.index = match.index + match[1].length;
@@ -62,6 +59,14 @@ exports.Parser = function ENTimeExpressionParser(){
         var minute = 0;
         var meridiem = -1;
 
+        // ----- Millisecond
+        if(match[MILLI_SECOND_GROUP] != null){ 
+            var millisecond = parseInt(match[MILLI_SECOND_GROUP].substring(0, 3));
+            if(millisecond >= 1000) return null;
+            
+            result.start.assign('millisecond', millisecond);
+        }
+
         // ----- Second
         if(match[SECOND_GROUP] != null){ 
             var second = parseInt(match[SECOND_GROUP]);
@@ -127,16 +132,12 @@ exports.Parser = function ENTimeExpressionParser(){
                 result.start.imply('meridiem', 1);
             }
         }
-        
+
         // ==============================================================
         //                  Extracting the 'to' chunk
         // ==============================================================
         match = SECOND_REG_PATTERN.exec(text.substring(result.index + result.text.length));
         if (!match) {
-            // Not accept number only result
-            if (result.text.match(/^\d+$/)) { 
-                return null;
-            }
             return result;
         }
 
@@ -155,6 +156,14 @@ exports.Parser = function ENTimeExpressionParser(){
         var minute = 0;
         var meridiem = -1;
 
+        // ----- Millisecond
+        if(match[MILLI_SECOND_GROUP] != null){ 
+            var millisecond = parseInt(match[MILLI_SECOND_GROUP].substring(0, 3));
+            if(millisecond >= 1000) return null;
+            
+            result.end.assign('millisecond', millisecond);
+        }
+        
         // ----- Second
         if(match[SECOND_GROUP] != null){ 
             var second = parseInt(match[SECOND_GROUP]);

package/src/parsers/en/ENTimeLaterFormatParser.js

@@ -0,0 +1,75 @@
+const dayjs = require('dayjs');
+var Parser = require('../parser').Parser;
+var ParsedResult = require('../../result').ParsedResult;
+var util  = require('../../utils/EN');
+
+var PATTERN = new RegExp('' +
+    /*match[1]*/ '(\\W|^)' +
+    /*match[2]*/ '(in )?' +
+    /*match[3]*/ '(' + util.TIME_UNIT_PATTERN + ')' +
+    /*match[4]*/ '(later|after|from now|henceforth|forward|out)?' +
+    /*match[5]*/ '(?=(?:\\W|$))',
+'i');
+
+var STRICT_PATTERN = new RegExp('' +
+    /*match[1]*/ '(\\W|^)' +
+    /*match[2]*/ '(in )?' +
+    /*match[3]*/ '(' + util.TIME_UNIT_STRICT_PATTERN + ')' +
+    /*match[4]*/ '(later|from now)?' +
+    /*match[5]*/ '(?=(?:\\W|$))',
+'i');
+
+exports.Parser = function ENTimeLaterFormatParser(){
+    Parser.apply(this, arguments);
+
+    this.pattern = function() {
+        return this.isStrictMode()? STRICT_PATTERN : PATTERN;
+    };
+
+    this.extract = function(text, ref, match, opt){
+        if (match.index > 0 && text[match.index-1].match(/\w/)) return null;
+
+        var prefix = match[2];
+        var suffix = match[4];
+        if (!prefix && !suffix) return null;
+
+        var preamble = match[1];
+        var text  = match[0].substr(preamble.length, match[0].length - preamble.length);
+        var index = match.index + preamble.length;
+
+        var result = new ParsedResult({
+            index: index,
+            text: text,
+            ref: ref
+        });
+
+        var fragments = util.extractDateTimeUnitFragments(match[3]);
+        var date = dayjs(ref);
+        for (var key in fragments) {
+            date = date.add(fragments[key], key);
+        }
+
+        if (fragments['hour'] > 0 || fragments['minute'] > 0 || fragments['second'] > 0) {
+            result.start.assign('hour', date.hour());
+            result.start.assign('minute', date.minute());
+            result.start.assign('second', date.second());
+            result.tags['ENTimeAgoFormatParser'] = true;
+        } 
+        
+        if (fragments['d'] > 0 || fragments['month'] > 0 || fragments['year'] > 0) {
+            result.start.assign('day', date.date());
+            result.start.assign('month', date.month() + 1);
+            result.start.assign('year', date.year());
+        } else {
+            if (fragments['week'] > 0) {
+                result.start.imply('weekday', date.day());
+            }
+
+            result.start.imply('day', date.date());
+            result.start.imply('month', date.month() + 1);
+            result.start.imply('year', date.year());
+        }
+
+        return result;
+    };
+}

package/src/parsers/{EN → en}/ENWeekdayParser.js

@@ -1,8 +1,4 @@
-/*
-
-
-*/
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
@@ -25,25 +21,25 @@ var POSTFIX_GROUP = 4;
 
 exports.updateParsedComponent = function updateParsedComponent(result, ref, offset, modifier) {
 
-    var startMoment = moment(ref);
+    var startMoment = dayjs(ref);
     var startMomentFixed = false;
     var refOffset = startMoment.day();
 
     if(modifier == 'last' || modifier == 'past') {
-        startMoment.day(offset - 7);
+        startMoment =startMoment.day(offset - 7);
         startMomentFixed = true;
     } else if(modifier == 'next') {
-        startMoment.day(offset + 7);
+        startMoment = startMoment.day(offset + 7);
         startMomentFixed = true;
     } else if(modifier == 'this') {
-        startMoment.day(offset);
+        startMoment = startMoment.day(offset);
     } else {
         if (Math.abs(offset - 7 - refOffset) < Math.abs(offset - refOffset)) {
-            startMoment.day(offset - 7);
+            startMoment = startMoment.day(offset - 7);
         } else if (Math.abs(offset + 7 - refOffset) < Math.abs(offset - refOffset)) {
-            startMoment.day(offset + 7);
+            startMoment = startMoment.day(offset + 7);
         } else {
-            startMoment.day(offset);
+            startMoment = startMoment.day(offset);
         }
     }
 

package/src/parsers/{ES → es}/ESCasualDateParser.js

@@ -1,9 +1,4 @@
-/*
-
-
-*/
-
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
@@ -41,26 +36,26 @@ exports.Parser = function ESCasualDateParser(){
             ref: ref,
         });
 
-        var refMoment = moment(ref);
-        var startMoment = refMoment.clone();
+        var refMoment = dayjs(ref);
+        var startMoment = refMoment;
         var lowerText = text.toLowerCase().replace(/\s+/g, ' ');
 
         if(lowerText == 'mañana'){
 
             // Check not "Tomorrow" on late night
             if(refMoment.hour() > 1) {
-                startMoment.add(1, 'day');
+                startMoment = startMoment.add(1, 'day');
             }
 
         } else if(lowerText == 'ayer') {
 
-            startMoment.add(-1, 'day');
+            startMoment = startMoment.add(-1, 'day');
         }
         else if(lowerText == 'anoche') {
 
             result.start.imply('hour', 0);
             if (refMoment.hour() > 6) {
-                startMoment.add(-1, 'day');
+                startMoment = startMoment.add(-1, 'day');
             }
 
         } else if (lowerText.match("esta")) {
@@ -86,11 +81,11 @@ exports.Parser = function ESCasualDateParser(){
             var firstMatch = match[4].toLowerCase();
             if (firstMatch === 'ayer') {
 
-              startMoment.add(-1, 'day');
+                startMoment = startMoment.add(-1, 'day');
 
             } else if (firstMatch === 'mañana') {
 
-              startMoment.add(1, 'day');
+                startMoment = startMoment.add(1, 'day');
 
             }
 

package/src/parsers/{ES → es}/ESDeadlineFormatParser.js

@@ -1,9 +1,4 @@
-/*
-
-
-*/
-
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
@@ -35,10 +30,9 @@ exports.Parser = function ESDeadlineFormatParser(){
           }
         }
 
-        var date = moment(ref);
+        var date = dayjs(ref);
         if (match[4].match(/d[ií]a/)) {
-            date.add(num, 'd');
-
+            date = date.add(num, 'd');
             result.start.assign('year', date.year());
             result.start.assign('month', date.month() + 1);
             result.start.assign('day', date.date());
@@ -48,11 +42,11 @@ exports.Parser = function ESDeadlineFormatParser(){
 
         if (match[4].match(/hora/)) {
 
-            date.add(num, 'hour');
+            date = date.add(num, 'hour');
 
         } else if (match[4].match(/minuto/)) {
 
-            date.add(num, 'minute');
+            date = date.add(num, 'minute');
         }
 
         result.start.imply('year', date.year());

package/src/parsers/{ES → es}/ESMonthNameLittleEndianParser.js

@@ -1,11 +1,4 @@
-/*
-
-
-*/
-
-var moment = require('moment');
-
-var Parser = require('../parser').Parser;
+var parser = require('../parser');
 var ParsedResult = require('../../result').ParsedResult;
 
 var util  = require('../../utils/ES');
@@ -16,7 +9,7 @@ var PATTERN = new RegExp('(\\W|^)' +
         '(?:(Domingo|Lunes|Martes|Miércoles|Miercoles|Jueves|Viernes|Sábado|Sabado|Dom|Lun|Mar|Mie|Jue|Vie|Sab)\\s*,?\\s*)?' +
         '([0-9]{1,2})(?:º|ª|°)?' +
         '(?:\\s*(?:desde|de|\\-|\\–|al?|hasta|\\s)\\s*([0-9]{1,2})(?:º|ª|°)?)?\\s*(?:de)?\\s*' +
-        '(Ene(?:ro|\\.)?|Feb(?:rero|\\.)?|Mar(?:zo|\\.)?|Abr(?:il|\\.)?|May(?:o|\\.)?|Jun(?:io|\\.)?|Jul(?:io|\\.)?|Ago(?:sto|\\.)?|Sep(?:tiembre|\\.)?|Oct(?:ubre|\\.)?|Nov(?:iembre|\\.)?|Dic(?:iembre|\\.)?)' +
+        '(Ene(?:ro|\\.)?|Feb(?:rero|\\.)?|Mar(?:zo|\\.)?|Abr(?:il|\\.)?|May(?:o|\\.)?|Jun(?:io|\\.)?|Jul(?:io|\\.)?|Ago(?:sto|\\.)?|Sep(?:tiembre|\\.)?|Set(?:iembre|\\.)?|Oct(?:ubre|\\.)?|Nov(?:iembre|\\.)?|Dic(?:iembre|\\.)?)' +
         '(?:\\s*(?:del?)?(\\s*[0-9]{1,4}(?![^\\s]\\d))(\\s*[ad]\\.?\\s*c\\.?|a\\.?\\s*d\\.?)?)?' +
         '(?=\\W|$)', 'i'
     );
@@ -29,7 +22,7 @@ var YEAR_GROUP = 6;
 var YEAR_BE_GROUP = 7;
 
 exports.Parser = function ESMonthNameLittleEndianParser(){
-    Parser.apply(this, arguments);
+    parser.Parser.apply(this, arguments);
 
     this.pattern = function() { return PATTERN; }
 
@@ -68,25 +61,10 @@ exports.Parser = function ESMonthNameLittleEndianParser(){
             result.start.assign('month', month);
             result.start.assign('year', year);
         } else {
-
-            //Find the most appropriated year
-            var refMoment = moment(ref);
-            refMoment.month(month - 1);
-            refMoment.date(day);
-            refMoment.year(moment(ref).year());
-
-            var nextYear = refMoment.clone().add(1, 'y');
-            var lastYear = refMoment.clone().add(-1, 'y');
-            if( Math.abs(nextYear.diff(moment(ref))) < Math.abs(refMoment.diff(moment(ref))) ){
-                refMoment = nextYear;
-            }
-            else if( Math.abs(lastYear.diff(moment(ref))) < Math.abs(refMoment.diff(moment(ref))) ){
-                refMoment = lastYear;
-            }
-
+            year = parser.findYearClosestToRef(ref, day, month);
             result.start.assign('day', day);
             result.start.assign('month', month);
-            result.start.imply('year', refMoment.year());
+            result.start.imply('year', year);
         }
 
         // Weekday component
@@ -105,4 +83,4 @@ exports.Parser = function ESMonthNameLittleEndianParser(){
         result.tags['ESMonthNameLittleEndianParser'] = true;
         return result;
     };
-}
+}

package/src/parsers/{ES → es}/ESSlashDateFormatParser.js

@@ -4,7 +4,7 @@
     - 3/11/2015
     - 3/11
 */
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
@@ -65,7 +65,7 @@ exports.Parser = function ESSlashDateFormatParser(argument) {
         if(!match[YEAR_GROUP] && match[0].indexOf('/') < 0) return;
 
         var date = null;
-        var year = match[YEAR_GROUP] || moment(ref).year() + '';
+        var year = match[YEAR_GROUP] || dayjs(ref).year() + '';
         var month = match[MONTH_GROUP];
         var day   = match[DAY_GROUP];
 

package/src/parsers/{ES → es}/ESTimeAgoFormatParser.js

@@ -1,9 +1,4 @@
-/*
-
-
-*/
-
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
@@ -39,16 +34,16 @@ exports.Parser = function ESTimeAgoFormatParser(){
           }
         }
 
-        var date = moment(ref);
+        var date = dayjs(ref);
 
         if (match[3].match(/hora/) || match[3].match(/minuto/)) {
             if (match[3].match(/hora/)) {
 
-                date.add(-num, 'hour');
+                date = date.add(-num, 'hour');
 
             } else if (match[3].match(/minuto/)) {
 
-                date.add(-num, 'minute');
+                date = date.add(-num, 'minute');
             }
 
             result.start.imply('day', date.date());
@@ -61,7 +56,7 @@ exports.Parser = function ESTimeAgoFormatParser(){
         }
 
         if (match[3].match(/semana/)) {
-            date.add(-num, 'week');
+            date = date.add(-num, 'week');
 
             result.start.imply('day', date.date());
             result.start.imply('month', date.month() + 1);
@@ -71,16 +66,16 @@ exports.Parser = function ESTimeAgoFormatParser(){
         }
 
         if (match[3].match(/d[ií]a/)) {
-            date.add(-num, 'd');
+            date = date.add(-num, 'd');
         }
 
         if (match[3].match(/mes/)) {
-            date.add(-num, 'month');
+            date = date.add(-num, 'month');
         }
 
         if (match[3].match(/año/)) {
 
-            date.add(-num, 'year');
+            date = date.add(-num, 'year');
         }
 
         result.start.assign('day', date.date());

package/src/parsers/{ES → es}/ESTimeExpressionParser.js

@@ -1,9 +1,4 @@
-/*
-
-
-*/
-
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 var ParsedComponents = require('../../result').ParsedComponents;
@@ -47,7 +42,7 @@ exports.Parser = function ESTimeExpressionParser(){
 
         // This pattern can be overlaped Ex. [12] AM, 1[2] AM
         if (match.index > 0 && text[match.index-1].match(/\w/)) return null;
-        var refMoment = moment(ref);
+        var refMoment = dayjs(ref);
         var result = new ParsedResult();
         result.ref = ref;
         result.index = match.index + match[1].length;

package/src/parsers/{ES → es}/ESWeekdayParser.js

@@ -1,11 +1,6 @@
-/*
-
-
-*/
-var moment = require('moment');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
-var updateParsedComponent = require('../EN/ENWeekdayParser').updateParsedComponent;
+var updateParsedComponent = require('../en/ENWeekdayParser').updateParsedComponent;
 
 var DAYS_OFFSET = { 'domingo': 0, 'dom': 0, 'lunes': 1, 'lun': 1, 'martes': 2, 'mar':2, 'miercoles': 3, 'miércoles': 3, 'mie': 3,
     'jueves': 4, 'jue': 4, 'viernes': 5, 'vier': 5, 'sabado': 6, 'sábado': 6, 'sab': 6,}

package/src/parsers/{FR → fr}/FRCasualDateParser.js

@@ -1,9 +1,4 @@
-/*
-
-
-*/
-
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
@@ -25,19 +20,19 @@ exports.Parser = function FRCasualDateParser(){
             ref: ref,
         });
 
-        var refMoment = moment(ref);
-        var startMoment = refMoment.clone();
+        var refMoment = dayjs(ref);
+        var startMoment = refMoment;
         var lowerText = text.toLowerCase();
 
         if(lowerText.match(/demain/)){
             // Check not "Tomorrow" on late night
             if(refMoment.hour() > 1) {
-                startMoment.add(1, 'day');
+                startMoment = startMoment.add(1, 'day');
             }
         } 
 
         if(lowerText.match(/hier/)) {
-            startMoment.add(-1, 'day');
+            startMoment = startMoment.add(-1, 'day');
         }
 
         if(lowerText.match(/cette\s*nuit/)){
@@ -49,7 +44,7 @@ exports.Parser = function FRCasualDateParser(){
 
             result.start.imply('hour', 0);
             if (refMoment.hour() > 6) {
-                startMoment.add(-1, 'day');
+                startMoment = startMoment.add(-1, 'day');
             }
 
         } else if (lowerText.match(/(après-midi|aprem)/)) {

package/src/parsers/{FR → fr}/FRDeadlineFormatParser.js

@@ -1,9 +1,4 @@
-/*
-
-
-*/
-
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 var util  = require('../../utils/FR');
@@ -54,17 +49,17 @@ exports.Parser = function FRDeadlineFormatParser(){
             num = parseInt(num);
         }
 
-        var date = moment(ref);
+        var date = dayjs(ref);
         if (match[4].match(/jour|semaine|mois|année/i)) {
 
             if (match[4].match(/jour/)) {
-                date.add(num, 'd');
+                date = date.add(num, 'd');
             } else if (match[4].match(/semaine/i)) {
-                date.add(num * 7, 'd');
+                date = date.add(num * 7, 'd');
             } else if (match[4].match(/mois/i)) {
-                date.add(num, 'month');
+                date = date.add(num, 'month');
             } else if (match[4].match(/année/i)) {
-                date.add(num, 'year');
+                date = date.add(num, 'year');
             }
 
             result.start.assign('year', date.year());
@@ -75,15 +70,15 @@ exports.Parser = function FRDeadlineFormatParser(){
 
         if (match[4].match(/heure/i)) {
 
-            date.add(num, 'hour');
+            date = date.add(num, 'hour');
 
         } else if (match[4].match(/min/i)) {
 
-            date.add(num, 'minutes');
+            date = date.add(num, 'minutes');
 
         } else if (match[4].match(/secondes/i)) {
 
-            date.add(num, 'second');
+            date = date.add(num, 'second');
         }
 
         result.start.imply('year', date.year());

package/src/parsers/{FR → fr}/FRMonthNameLittleEndianParser.js

@@ -1,11 +1,4 @@
-/*
-
-
-*/
-
-var moment = require('moment');
-
-var Parser = require('../parser').Parser;
+const parser = require('../parser');
 var ParsedResult = require('../../result').ParsedResult;
 
 var util  = require('../../utils/FR');
@@ -29,7 +22,7 @@ var YEAR_GROUP = 6;
 var YEAR_BE_GROUP = 7;
 
 exports.Parser = function FRMonthNameLittleEndianParser(){
-    Parser.apply(this, arguments);
+    parser.Parser.apply(this, arguments);
 
     this.pattern = function() { return PATTERN; }
 
@@ -68,25 +61,10 @@ exports.Parser = function FRMonthNameLittleEndianParser(){
             result.start.assign('month', month);
             result.start.assign('year', year);
         } else {
-
-            // Find the most appropriated year
-            var refMoment = moment(ref);
-            refMoment.month(month - 1);
-            refMoment.date(day);
-            refMoment.year(moment(ref).year());
-
-            var nextYear = refMoment.clone().add(1, 'y');
-            var lastYear = refMoment.clone().add(-1, 'y');
-            if( Math.abs(nextYear.diff(moment(ref))) < Math.abs(refMoment.diff(moment(ref))) ){
-                refMoment = nextYear;
-            }
-            else if( Math.abs(lastYear.diff(moment(ref))) < Math.abs(refMoment.diff(moment(ref))) ){
-                refMoment = lastYear;
-            }
-
+            year = parser.findYearClosestToRef(ref, day, month)
             result.start.assign('day', day);
             result.start.assign('month', month);
-            result.start.imply('year', refMoment.year());
+            result.start.imply('year', year);
         }
 
         // Weekday component