chrono-node 1.3.5 → 1.4.4

package/package.json

@@ -1,41 +1,39 @@
 {
   "name": "chrono-node",
   "description": "A natural language date parser in Javascript",
-  "homepage": "http://github.com/berryboy/chrono",
+  "homepage": "http://github.com/wanasit/chrono",
   "repository": {
     "type": "git",
-    "url": "https://github.com/berryboy/chrono.git"
+    "url": "https://github.com/wanasit/chrono.git"
+  },
+  "jest": {
+    "verbose": true,
+    "testURL": "http://localhost/"
   },
   "license": "MIT",
-  "version": "1.3.5",
+  "version": "1.4.4",
   "directories": {
     "source": "./src",
     "test": "./test"
   },
-  "main": "./src/chrono",
+  "main": "./dist/chrono.js",
   "devDependencies": {
-    "browserify": "^14.3.0",
-    "coveralls": "^2.11.2",
-    "istanbul": "^0.4.5",
-    "karma": "~1.7.0",
-    "karma-browserify": "^5.1.1",
-    "karma-chrome-launcher": "~2.1.1",
-    "karma-firefox-launcher": "~1.0.1",
-    "karma-qunit": "^1.2.1",
-    "minifyify": "^7.0.6",
-    "qunit": "^1.0.0",
-    "watchify": "^3.9.0"
+    "@babel/core": "^7.8.4",
+    "@babel/preset-env": "^7.8.4",
+    "babel-loader": "^8.0.6",
+    "coveralls": "^3.0.2",
+    "jest": "^22.0.4",
+    "terser-webpack-plugin": "^2.3.4",
+    "webpack": "^4.41.5",
+    "webpack-cli": "^3.3.10"
   },
   "scripts": {
-    "make-bundle": "browserify src/chrono.js -d --s chrono -o chrono.js",
-    "make-minify": "browserify src/chrono.js -d --s chrono -d -p [minifyify --output chrono.map.json] -o chrono.min.js",
-    "make": "npm run make-bundle & npm run make-minify",
-    "watch": "watchify src/chrono.js -d --s chrono -o chrono.js",
-    "karma": "karma start",
-    "test": "qunit -l '{summary:true, tests: true}' -c chrono:src/chrono.js -p src -t test/*.js --cov --timeout 10000",
+    "build": "webpack",
+    "watch": "jest --watch",
+    "test": "jest --coverage",
     "coveralls": "npm run test && cat coverage/lcov.info | coveralls"
   },
   "dependencies": {
-    "moment": "^2.10.3"
+    "dayjs": "^1.8.19"
   }
 }

package/src/chrono.js

@@ -14,8 +14,6 @@ exports.ParsedComponents = require('./result').ParsedComponents;
 var Chrono = function(option) {
 
     option = option || exports.options.casualOption();
-
-    this.option = option;
     this.parsers = new Object(option.parsers);
     this.refiners = new Object(option.refiners);
 };
@@ -25,7 +23,8 @@ Chrono.prototype.parse = function(text, refDate, opt) {
 
     refDate = refDate || new Date();
     opt = opt || {};
-
+    opt.forwardDate = opt.forwardDate || opt.forwardDate;
+    
     var allResults = [];
 
     this.parsers.forEach(function (parser) {
@@ -66,6 +65,9 @@ exports.en_GB = new Chrono( options.mergeOptions([
 exports.de = new Chrono( options.mergeOptions([
     options.de.casual, options.en, options.commonPostProcessing]));
 
+exports.pt = new Chrono( options.mergeOptions([
+    options.pt.casual, options.en, options.commonPostProcessing]));
+
 exports.es = new Chrono( options.mergeOptions([
     options.es.casual, options.en, options.commonPostProcessing]));
 

package/src/options.js

@@ -56,11 +56,12 @@ exports.commonPostProcessing = function() {
 exports.strictOption = function () {
     var strictConfig = {
         strict: true
-    }
+    };
 
     return exports.mergeOptions([
         exports.en(strictConfig),
         exports.de(strictConfig),
+        exports.pt(strictConfig),
         exports.es(strictConfig),
         exports.fr(strictConfig),
         exports.ja(strictConfig),
@@ -74,6 +75,7 @@ exports.casualOption = function () {
         exports.en.casual,
         // Some German abbriviate overlap with common English
         exports.de({ strict: true }), 
+        exports.pt.casual,
         exports.es.casual,
         exports.fr.casual,
         exports.ja.casual,
@@ -129,7 +131,7 @@ exports.en = function(config) {
             new parser.ENSlashDateFormatStartWithYearParser(config),
             new parser.ENSlashMonthFormatParser(config),
             new parser.ENTimeAgoFormatParser(config),
-            new parser.ENTimeFromNowFormatParser(config),
+            new parser.ENTimeLaterFormatParser(config),
             new parser.ENTimeExpressionParser(config)
         ],
         refiners: [
@@ -149,7 +151,7 @@ exports.en.casual = function(config) {
     config.strict = false;
     var option = exports.en(config);
 
-    // EN
+    // en
     option.parsers.unshift(new parser.ENCasualDateParser());
     option.parsers.unshift(new parser.ENCasualTimeParser());
     option.parsers.unshift(new parser.ENWeekdayParser());
@@ -191,6 +193,34 @@ exports.ja.casual = function() {
     return option;
 };
 
+// -------------------------------------------------------------
+
+
+exports.pt = function(config) {
+    return {
+        parsers: [
+            new parser.PTTimeAgoFormatParser(config),
+            new parser.PTDeadlineFormatParser(config),
+            new parser.PTTimeExpressionParser(config),
+            new parser.PTMonthNameLittleEndianParser(config),
+            new parser.PTSlashDateFormatParser(config)
+        ],
+        refiners: [
+            new refiner.OverlapRemovalRefiner(),
+            new refiner.ForwardDateRefiner()
+        ]
+    }
+};
+
+exports.pt.casual = function() {
+    var option = exports.pt({ 
+        strict: false 
+    });
+
+    option.parsers.unshift(new parser.PTCasualDateParser());
+    option.parsers.unshift(new parser.PTWeekdayParser());
+    return option;
+};
 
 // -------------------------------------------------------------
 

package/src/parsers/{DE → de}/DECasualDateParser.js

@@ -1,9 +1,4 @@
-/*
-
-
-*/
-
-var moment = require('moment');
+var dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
@@ -25,43 +20,45 @@ exports.Parser = function DECasualDateParser() {
     this.pattern = function() { return PATTERN; }
 
     this.extract = function(text, ref, match, opt) {
-        var text = match[0].substr(match[1].length);
-        var index = match.index + match[1].length;
-        var result = new ParsedResult({
+        text = match[0].substr(match[1].length);
+        
+        const index = match.index + match[1].length;
+        const result = new ParsedResult({
             index: index,
             text: text,
             ref: ref,
         });
 
-        var refMoment = moment(ref);
-        var startMoment = refMoment.clone();
-        var lowerText = text.toLowerCase();
+        const refMoment = dayjs(ref);
+        const lowerText = text.toLowerCase();
+
+        var startMoment = refMoment;
 
         if (/(?:heute|diese)\s*nacht/.test(lowerText)) {
             // Normally means this coming midnight
             result.start.imply('hour', 22);
             result.start.imply('meridiem', 1);
         } else if (/^(?:ü|ue)bermorgen/.test(lowerText)) {
-            startMoment.add(refMoment.hour() > 1 ? 2 : 1, 'day');
+            startMoment = startMoment.add(refMoment.hour() > 1 ? 2 : 1, 'day');
         } else if (/^morgen/.test(lowerText)) {
             // Check not "Tomorrow" on late night
             if (refMoment.hour() > 1) {
-                startMoment.add(1, 'day');
+                startMoment = startMoment.add(1, 'day');
             }
         } else if (/^gestern/.test(lowerText)) {
-            startMoment.add(-1, 'day');
+            startMoment = startMoment.add(-1, 'day');
         } else if (/^vorgestern/.test(lowerText)) {
-            startMoment.add(-2, 'day');
+            startMoment = startMoment.add(-2, 'day');
         } else if (/letzte\s*nacht/.test(lowerText)) {
             result.start.imply('hour', 0);
             if (refMoment.hour() > 6) {
-                startMoment.add(-1, 'day');
+                startMoment = startMoment.add(-1, 'day');
             }
         } else if (lowerText === 'jetzt') {
-          result.start.imply('hour', refMoment.hour());
-          result.start.imply('minute', refMoment.minute());
-          result.start.imply('second', refMoment.second());
-          result.start.imply('millisecond', refMoment.millisecond());
+            result.start.imply('hour', refMoment.hour());
+            result.start.imply('minute', refMoment.minute());
+            result.start.imply('second', refMoment.second());
+            result.start.imply('millisecond', refMoment.millisecond());
         }
 
         var secondMatch = match[3] || match[4] || match[5];

package/src/parsers/{DE → de}/DEDeadlineFormatParser.js

@@ -3,7 +3,7 @@
 
 */
 
-var moment = require('moment');
+var dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 var util  = require('../../utils/DE');
@@ -54,17 +54,17 @@ exports.Parser = function DEDeadlineFormatParser(){
             num = parseInt(num);
         }
 
-        var date = moment(ref);
+        var date = dayjs(ref);
         if (/tag|woche|monat|jahr/i.test(match[4])) {
 
             if (/tag/i.test(match[4])) {
-                date.add(num, 'd');
+                date = date.add(num, 'd');
             } else if (/woche/i.test(match[4])) {
-                date.add(num * 7, 'd');
+                date = date.add(num * 7, 'd');
             } else if (/monat/i.test(match[4])) {
-                date.add(num, 'month');
+                date = date.add(num, 'month');
             } else if (/jahr/i.test(match[4])) {
-                date.add(num, 'year');
+                date = date.add(num, 'year');
             }
 
             result.start.assign('year', date.year());
@@ -75,15 +75,15 @@ exports.Parser = function DEDeadlineFormatParser(){
 
         if (/stunde/i.test(match[4])) {
 
-            date.add(num, 'hour');
+            date = date.add(num, 'hour');
 
         } else if (/min/i.test(match[4])) {
 
-            date.add(num, 'minute');
+            date = date.add(num, 'minute');
 
         } else if (/sekunde/i.test(match[4])) {
 
-            date.add(num, 'second');
+            date = date.add(num, 'second');
         }
 
         result.start.imply('year', date.year());

package/src/parsers/{DE → de}/DEMonthNameLittleEndianParser.js

@@ -1,15 +1,9 @@
-/*
+const dayjs = require('dayjs');
+const parser = require('../parser');
+const ParsedResult = require('../../result').ParsedResult;
+const util  = require('../../utils/DE');
 
-
-*/
-
-var moment = require('moment');
-
-var Parser = require('../parser').Parser;
-var ParsedResult = require('../../result').ParsedResult;
-var util  = require('../../utils/DE');
-
-var PATTERN = new RegExp('(\\W|^)' +
+const PATTERN = new RegExp('(\\W|^)' +
         '(?:am\\s*?)?' +
         '(?:(Sonntag|Montag|Dienstag|Mittwoch|Donnerstag|Freitag|Samstag|So|Mo|Di|Mi|Do|Fr|Sa)\\s*,?\\s*)?' +
         '(?:den\\s*)?' +
@@ -23,21 +17,21 @@ var PATTERN = new RegExp('(\\W|^)' +
         '(?=\\W|$)', 'i'
     );
 
-var WEEKDAY_GROUP = 2;
-var DATE_GROUP = 3;
-var DATE_TO_GROUP = 4;
-var MONTH_NAME_GROUP = 5;
-var YEAR_GROUP = 6;
-var YEAR_BE_GROUP = 7;
+const WEEKDAY_GROUP = 2;
+const DATE_GROUP = 3;
+const DATE_TO_GROUP = 4;
+const MONTH_NAME_GROUP = 5;
+const YEAR_GROUP = 6;
+const YEAR_BE_GROUP = 7;
 
 exports.Parser = function DEMonthNameLittleEndianParser(){
-    Parser.apply(this, arguments);
+    parser.Parser.apply(this, arguments);
 
     this.pattern = function() { return PATTERN; }
 
     this.extract = function(text, ref, match, opt){
 
-        var result = new ParsedResult({
+        const result = new ParsedResult({
             text: match[0].substr(match[1].length, match[0].length - match[1].length),
             index: match.index + match[1].length,
             ref: ref,
@@ -70,25 +64,10 @@ exports.Parser = function DEMonthNameLittleEndianParser(){
             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

package/src/parsers/{DE → de}/DEMonthNameParser.js

@@ -7,13 +7,11 @@
         - Januar 2012
 */
 
-var moment = require('moment');
+const parser = require('../parser');
+const ParsedResult = require('../../result').ParsedResult;
+const util  = require('../../utils/DE');
 
-var Parser = require('../parser').Parser;
-var ParsedResult = require('../../result').ParsedResult;
-var util  = require('../../utils/DE');
-
-var PATTERN = new RegExp('(^|\\D\\s+|[^\\w\\s])' +
+const PATTERN = new RegExp('(^|\\D\\s+|[^\\w\\s])' +
     '(Jan\\.?|Januar|Feb\\.?|Februar|Mär\\.?|M(?:ä|ae)rz|Mrz\\.?|Apr\\.?|April|Mai\\.?|Jun\\.?|Juni|Jul\\.?|Juli|Aug\\.?|August|Sep\\.?|Sept\\.?|September|Okt\\.?|Oktober|Nov\\.?|November|Dez\\.?|Dezember)' + 
     '\\s*' +
     '(?:' +
@@ -21,14 +19,14 @@ var PATTERN = new RegExp('(^|\\D\\s+|[^\\w\\s])' +
     ')?' +
     '(?=[^\\s\\w]|$)', 'i');
 
-var MONTH_NAME_GROUP = 2;
-var YEAR_GROUP = 3;
-var YEAR_BE_GROUP = 4;
-var YEAR_GROUP2 = 5;
-var YEAR_BE_GROUP2 = 6;
+const MONTH_NAME_GROUP = 2;
+const YEAR_GROUP = 3;
+const YEAR_BE_GROUP = 4;
+const YEAR_GROUP2 = 5;
+const YEAR_BE_GROUP2 = 6;
 
 exports.Parser = function ENMonthNameParser(){
-    Parser.apply(this, arguments);
+    parser.Parser.apply(this, arguments);
 
     this.pattern = function() { return PATTERN; }
     
@@ -68,23 +66,10 @@ exports.Parser = function ENMonthNameParser(){
             result.start.assign('year', year);
         } else {
             
-            //Find the most appropriated year
-            var refMoment = moment(ref);
-            refMoment.month(month - 1);
-            refMoment.date(day);
-
-            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.imply('day', day);
             result.start.assign('month', month);
-            result.start.imply('year', refMoment.year());
+            result.start.imply('year', year);
         }
 
         result.tags['DEMonthNameParser'] = true;

package/src/parsers/{DE → de}/DESlashDateFormatParser.js

@@ -4,7 +4,7 @@
     - 11/3/2015
     - 11/3
 */
-var moment = require('moment');
+var dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
@@ -72,8 +72,7 @@ exports.Parser = function DESlashDateFormatParser(argument) {
         // MM.dd -> NG
         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/{DE → de}/DETimeAgoFormatParser.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/DE');
@@ -54,20 +49,20 @@ exports.Parser = function DETimeAgoFormatParser(){
             num = parseInt(num);
         }
 
-        var date = moment(ref);
+        var date = dayjs(ref);
 
         if (/stunde|min|sekunde/i.test(match[3])) {
             if (/stunde/i.test(match[3])) {
 
-                date.add(-num, 'hour');
+                date = date.add(-num, 'hour');
 
             } else if (/min/i.test(match[3])) {
 
-                date.add(-num, 'minute');
+                date = date.add(-num, 'minute');
 
             } else if (/sekunde/i.test(match[3])) {
 
-                date.add(-num, 'second');
+                date = date.add(-num, 'second');
             }
 
             result.start.imply('day', date.date());
@@ -81,7 +76,7 @@ exports.Parser = function DETimeAgoFormatParser(){
         }
 
         if (/woche/i.test(match[3])) {
-            date.add(-num, 'week');
+            date = date.add(-num, 'week');
 
             result.start.imply('day', date.date());
             result.start.imply('month', date.month() + 1);
@@ -91,16 +86,16 @@ exports.Parser = function DETimeAgoFormatParser(){
         }
 
         if (/tag/i.test(match[3])) {
-            date.add(-num, 'd');
+            date = date.add(-num, 'd');
         }
 
         if (/monat/i.test(match[3])) {
-            date.add(-num, 'month');
+            date = date.add(-num, 'month');
         }
 
         if (/jahr/i.test(match[3])) {
 
-            date.add(-num, 'year');
+            date = date.add(-num, 'year');
         }
 
         result.start.assign('day', date.date());

package/src/parsers/{DE → de}/DETimeExpressionParser.js

@@ -3,7 +3,7 @@
 
 */
 
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 var ParsedComponents = require('../../result').ParsedComponents;
@@ -49,7 +49,7 @@ exports.Parser = function DETimeExpressionParser() {
         
         // 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/{DE → de}/DEWeekdayParser.js

@@ -2,7 +2,7 @@
 
 
 */
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
@@ -47,7 +47,7 @@ exports.Parser = function DEWeekdayParser() {
         var offset = DAYS_OFFSET[dayOfWeek];
         if(offset === undefined) return null;
 
-        var startMoment = moment(ref);
+        var startMoment = dayjs(ref);
         var prefix = match[PREFIX_GROUP];
         var postfix = match[POSTFIX_GROUP];
 
@@ -56,24 +56,24 @@ exports.Parser = function DEWeekdayParser() {
         norm = norm || '';
         norm = norm.toLowerCase();
         if (/letzte/.test(norm)) {
-            startMoment.day(offset - 7);
+            startMoment = startMoment.day(offset - 7);
         } else if (/n(?:ä|ae)chste/.test(norm)) {
-            startMoment.day(offset + 7);
+            startMoment = startMoment.day(offset + 7);
         } else if (/diese/.test(norm)) {
-            if ( opt.forwardDatesOnly && refOffset > offset ) {
-                startMoment.day(offset + 7);
+            if ( opt.forwardDate && refOffset > offset ) {
+                startMoment = startMoment.day(offset + 7);
             } else {
-                startMoment.day(offset);
+                startMoment = startMoment.day(offset);
             }
         } else {
-            if ( opt.forwardDatesOnly && refOffset > offset ) {
-                startMoment.day(offset + 7);
-            } else if (!opt.forwardDatesOnly && Math.abs(offset - 7 - refOffset) < Math.abs(offset - refOffset)) {
-                startMoment.day(offset - 7);
-            } else if (!opt.forwardDatesOnly && Math.abs(offset + 7 - refOffset) < Math.abs(offset - refOffset)) {
-                startMoment.day(offset + 7);
+            if ( opt.forwardDate && refOffset > offset ) {
+                startMoment = startMoment.day(offset + 7);
+            } else if (!opt.forwardDate && Math.abs(offset - 7 - refOffset) < Math.abs(offset - refOffset)) {
+                startMoment = startMoment.day(offset - 7);
+            } else if (!opt.forwardDate && Math.abs(offset + 7 - refOffset) < Math.abs(offset - refOffset)) {
+                startMoment = startMoment.day(offset + 7);
             } else {
-                startMoment.day(offset);
+                startMoment = startMoment.day(offset);
             }
         }
 

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

@@ -1,9 +1,4 @@
-/*
-
-
-*/
-
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
@@ -25,8 +20,8 @@ exports.Parser = function ENCasualDateParser(){
             ref: ref,
         });
 
-        var refMoment = moment(ref);
-        var startMoment = refMoment.clone();
+        var refMoment = dayjs(ref);
+        var startMoment = refMoment;
         var lowerText = text.toLowerCase();
 
         if(lowerText == 'tonight'){
@@ -38,18 +33,18 @@ exports.Parser = function ENCasualDateParser(){
 
             // Check not "Tomorrow" on late night
             if(refMoment.hour() > 1) {
-                startMoment.add(1, 'day');
+                startMoment = startMoment.add(1, 'day');
             }
 
         } else if (/^yesterday/.test(lowerText)) {
 
-            startMoment.add(-1, 'day');
+            startMoment = startMoment.add(-1, 'day');
 
         } else if(lowerText.match(/last\s*night/)) {
 
             result.start.imply('hour', 0);
             if (refMoment.hour() > 6) {
-                startMoment.add(-1, 'day');
+                startMoment = startMoment.add(-1, 'day');
             }
 
         } else if (lowerText.match("now")) {