chrono-node 1.3.2 → 1.3.11

package/src/parsers/en/ENTimeLaterFormatParser.js

@@ -0,0 +1,77 @@
+var moment = require('moment');
+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];
+        text  = match[0].substr(preamble.length, match[0].length - preamble.length);
+        index = match.index + preamble.length;
+
+        var result = new ParsedResult({
+            index: index,
+            text: text,
+            ref: ref
+        });
+
+        var fragments = util.extractDateTimeUnitFragments(match[3]);
+        var date = moment(ref);
+        for (var key in fragments) {
+            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/{ES → es}/ESMonthNameLittleEndianParser.js

@@ -16,7 +16,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'
     );
@@ -105,4 +105,4 @@ exports.Parser = function ESMonthNameLittleEndianParser(){
         result.tags['ESMonthNameLittleEndianParser'] = true;
         return result;
     };
-}
+}

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

@@ -5,7 +5,7 @@
 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}/FRRelativeDateFormatParser.js

@@ -8,8 +8,12 @@ var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 var util  = require('../../utils/FR');
 
-// Load fr localization data from moment
+// Force load fr localization data from moment for the locale files to be linkded durning browserify.
+// NOTE: The function moment.defineLocale() also has a side effect that it change global locale
+//  We also need to save and restore the previous locale (see. moment.js, loadLocale)
+var originalLocale = moment.locale();
 require('moment/locale/fr');
+moment.locale(originalLocale);
 
 var PATTERN = new RegExp('(\\W|^)' +
     '(?:les?|la|l\'|du|des?)\\s*' +

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

@@ -32,6 +32,7 @@ var WEEKDAY_GROUP = 2;
 var DAY_GROUP = 3;
 var MONTH_GROUP = 4;
 var YEAR_GROUP = 5;
+var YEAR_BE_GROUP = 6;
 
 exports.Parser = function FRSlashDateFormatParser(argument) {
     Parser.apply(this, arguments);
@@ -65,13 +66,27 @@ exports.Parser = function FRSlashDateFormatParser(argument) {
         if(!match[YEAR_GROUP] && match[0].indexOf('/') < 0) return;
 
         var date = null;
-        var year = match[YEAR_GROUP] || moment(ref).year() + '';
         var month = match[MONTH_GROUP];
         var day   = match[DAY_GROUP];
 
         day  = parseInt(day);
         month = parseInt(month);
-        year = parseInt(year);
+
+        var year = null;
+        if (match[YEAR_GROUP]) {
+            year = match[YEAR_GROUP];
+            year = parseInt(year);
+
+            if(match[YEAR_BE_GROUP]){
+                if (/a/i.test(match[YEAR_BE_GROUP])) {
+                    // Ante Christe natum
+                    year = -year;
+                }
+            } else if (year < 100){
+
+                year = year + 2000;
+            }
+        }
 
         if(month < 1 || month > 12) {
             if(month > 12) {
@@ -88,19 +103,34 @@ exports.Parser = function FRSlashDateFormatParser(argument) {
                 }
             }
         }
+
         if(day < 1 || day > 31) return null;
 
-        if(year < 100){
-            if(year > 50){
-                year = year + 1900;
-            }else{
-                year = year + 2000;
+        if(year){
+            result.start.assign('day', day);
+            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;
             }
-        }
 
-        result.start.assign('day', day);
-        result.start.assign('month', month);
-        result.start.assign('year', year);
+            result.start.assign('day', day);
+            result.start.assign('month', month);
+            result.start.imply('year', refMoment.year());
+        }
 
         // Day of week
         if(match[WEEKDAY_GROUP]) {

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

@@ -5,7 +5,7 @@
 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 = { 'dimanche': 0, 'dim': 0, 'lundi': 1, 'lun': 1,'mardi': 2, 'mar':2, 'mercredi': 3, 'mer': 3,
     'jeudi': 4, 'jeu':4, 'vendredi': 5, 'ven': 5,'samedi': 6, 'sam': 6};

package/src/parsers/parser.js

@@ -53,52 +53,53 @@ function Parser(config) {
 
 exports.Parser = Parser;
 
-exports.ENISOFormatParser = require('./EN/ENISOFormatParser').Parser;
-exports.ENDeadlineFormatParser = require('./EN/ENDeadlineFormatParser').Parser;
-exports.ENRelativeDateFormatParser = require('./EN/ENRelativeDateFormatParser').Parser;
-exports.ENMonthNameLittleEndianParser = require('./EN/ENMonthNameLittleEndianParser').Parser;
-exports.ENMonthNameMiddleEndianParser = require('./EN/ENMonthNameMiddleEndianParser').Parser;
-exports.ENMonthNameParser = require('./EN/ENMonthNameParser').Parser;
-exports.ENSlashDateFormatParser = require('./EN/ENSlashDateFormatParser').Parser;
-exports.ENSlashDateFormatStartWithYearParser = require('./EN/ENSlashDateFormatStartWithYearParser').Parser;
-exports.ENSlashMonthFormatParser = require('./EN/ENSlashMonthFormatParser').Parser;
-exports.ENTimeAgoFormatParser = require('./EN/ENTimeAgoFormatParser').Parser;
-exports.ENTimeExpressionParser = require('./EN/ENTimeExpressionParser').Parser;
-exports.ENWeekdayParser = require('./EN/ENWeekdayParser').Parser;
-exports.ENCasualDateParser = require('./EN/ENCasualDateParser').Parser;
-exports.ENCasualTimeParser = require('./EN/ENCasualTimeParser').Parser;
-
-exports.JPStandardParser = require('./JP/JPStandardParser').Parser;
-exports.JPCasualDateParser = require('./JP/JPCasualDateParser').Parser;
-
-exports.ESCasualDateParser = require('./ES/ESCasualDateParser').Parser;
-exports.ESDeadlineFormatParser = require('./ES/ESDeadlineFormatParser').Parser;
-exports.ESTimeAgoFormatParser = require('./ES/ESTimeAgoFormatParser').Parser;
-exports.ESTimeExpressionParser = require('./ES/ESTimeExpressionParser').Parser;
-exports.ESWeekdayParser = require('./ES/ESWeekdayParser').Parser;
-exports.ESMonthNameLittleEndianParser = require('./ES/ESMonthNameLittleEndianParser').Parser;
-exports.ESSlashDateFormatParser = require('./ES/ESSlashDateFormatParser').Parser;
-
-exports.FRCasualDateParser = require('./FR/FRCasualDateParser').Parser;
-exports.FRDeadlineFormatParser = require('./FR/FRDeadlineFormatParser').Parser;
-exports.FRMonthNameLittleEndianParser = require('./FR/FRMonthNameLittleEndianParser').Parser;
-exports.FRSlashDateFormatParser = require('./FR/FRSlashDateFormatParser').Parser;
-exports.FRTimeAgoFormatParser = require('./FR/FRTimeAgoFormatParser').Parser;
-exports.FRTimeExpressionParser = require('./FR/FRTimeExpressionParser').Parser;
-exports.FRWeekdayParser = require('./FR/FRWeekdayParser').Parser;
-exports.FRRelativeDateFormatParser = require('./FR/FRRelativeDateFormatParser').Parser;
-
-exports.ZHHantDateParser = require('./ZH-Hant/ZHHantDateParser').Parser;
-exports.ZHHantWeekdayParser = require('./ZH-Hant/ZHHantWeekdayParser').Parser;
-exports.ZHHantTimeExpressionParser = require('./ZH-Hant/ZHHantTimeExpressionParser').Parser;
-exports.ZHHantCasualDateParser = require('./ZH-Hant/ZHHantCasualDateParser').Parser;
-exports.ZHHantDeadlineFormatParser = require('./ZH-Hant/ZHHantDeadlineFormatParser').Parser;
-
-exports.DEDeadlineFormatParser = require('./DE/DEDeadlineFormatParser').Parser;
-exports.DEMonthNameLittleEndianParser = require('./DE/DEMonthNameLittleEndianParser').Parser;
-exports.DEMonthNameParser = require('./DE/DEMonthNameParser').Parser;
-exports.DESlashDateFormatParser = require('./DE/DESlashDateFormatParser').Parser;
-exports.DETimeAgoFormatParser = require('./DE/DETimeAgoFormatParser').Parser;
-exports.DETimeExpressionParser = require('./DE/DETimeExpressionParser').Parser;
-exports.DEWeekdayParser = require('./DE/DEWeekdayParser').Parser;
-exports.DECasualDateParser = require('./DE/DECasualDateParser').Parser;
+exports.ENISOFormatParser = require('./en/ENISOFormatParser').Parser;
+exports.ENDeadlineFormatParser = require('./en/ENDeadlineFormatParser').Parser;
+exports.ENRelativeDateFormatParser = require('./en/ENRelativeDateFormatParser').Parser;
+exports.ENMonthNameLittleEndianParser = require('./en/ENMonthNameLittleEndianParser').Parser;
+exports.ENMonthNameMiddleEndianParser = require('./en/ENMonthNameMiddleEndianParser').Parser;
+exports.ENMonthNameParser = require('./en/ENMonthNameParser').Parser;
+exports.ENSlashDateFormatParser = require('./en/ENSlashDateFormatParser').Parser;
+exports.ENSlashDateFormatStartWithYearParser = require('./en/ENSlashDateFormatStartWithYearParser').Parser;
+exports.ENSlashMonthFormatParser = require('./en/ENSlashMonthFormatParser').Parser;
+exports.ENTimeAgoFormatParser = require('./en/ENTimeAgoFormatParser').Parser;
+exports.ENTimeExpressionParser = require('./en/ENTimeExpressionParser').Parser;
+exports.ENTimeLaterFormatParser = require('./en/ENTimeLaterFormatParser').Parser;
+exports.ENWeekdayParser = require('./en/ENWeekdayParser').Parser;
+exports.ENCasualDateParser = require('./en/ENCasualDateParser').Parser;
+exports.ENCasualTimeParser = require('./en/ENCasualTimeParser').Parser;
+
+exports.JPStandardParser = require('./ja/JPStandardParser').Parser;
+exports.JPCasualDateParser = require('./ja/JPCasualDateParser').Parser;
+
+exports.ESCasualDateParser = require('./es/ESCasualDateParser').Parser;
+exports.ESDeadlineFormatParser = require('./es/ESDeadlineFormatParser').Parser;
+exports.ESTimeAgoFormatParser = require('./es/ESTimeAgoFormatParser').Parser;
+exports.ESTimeExpressionParser = require('./es/ESTimeExpressionParser').Parser;
+exports.ESWeekdayParser = require('./es/ESWeekdayParser').Parser;
+exports.ESMonthNameLittleEndianParser = require('./es/ESMonthNameLittleEndianParser').Parser;
+exports.ESSlashDateFormatParser = require('./es/ESSlashDateFormatParser').Parser;
+
+exports.FRCasualDateParser = require('./fr/FRCasualDateParser').Parser;
+exports.FRDeadlineFormatParser = require('./fr/FRDeadlineFormatParser').Parser;
+exports.FRMonthNameLittleEndianParser = require('./fr/FRMonthNameLittleEndianParser').Parser;
+exports.FRSlashDateFormatParser = require('./fr/FRSlashDateFormatParser').Parser;
+exports.FRTimeAgoFormatParser = require('./fr/FRTimeAgoFormatParser').Parser;
+exports.FRTimeExpressionParser = require('./fr/FRTimeExpressionParser').Parser;
+exports.FRWeekdayParser = require('./fr/FRWeekdayParser').Parser;
+exports.FRRelativeDateFormatParser = require('./fr/FRRelativeDateFormatParser').Parser;
+
+exports.ZHHantDateParser = require('./zh-Hant/ZHHantDateParser').Parser;
+exports.ZHHantWeekdayParser = require('./zh-Hant/ZHHantWeekdayParser').Parser;
+exports.ZHHantTimeExpressionParser = require('./zh-Hant/ZHHantTimeExpressionParser').Parser;
+exports.ZHHantCasualDateParser = require('./zh-Hant/ZHHantCasualDateParser').Parser;
+exports.ZHHantDeadlineFormatParser = require('./zh-Hant/ZHHantDeadlineFormatParser').Parser;
+
+exports.DEDeadlineFormatParser = require('./de/DEDeadlineFormatParser').Parser;
+exports.DEMonthNameLittleEndianParser = require('./de/DEMonthNameLittleEndianParser').Parser;
+exports.DEMonthNameParser = require('./de/DEMonthNameParser').Parser;
+exports.DESlashDateFormatParser = require('./de/DESlashDateFormatParser').Parser;
+exports.DETimeAgoFormatParser = require('./de/DETimeAgoFormatParser').Parser;
+exports.DETimeExpressionParser = require('./de/DETimeExpressionParser').Parser;
+exports.DEWeekdayParser = require('./de/DEWeekdayParser').Parser;
+exports.DECasualDateParser = require('./de/DECasualDateParser').Parser;

package/src/parsers/{ZH-Hant → zh-Hant}/ZHHantCasualDateParser.js

@@ -9,9 +9,9 @@ var ParsedResult = require('../../result').ParsedResult;
 
 var PATTERN = new RegExp(
     '(而家|立(?:刻|即)|即刻)|' +
-    '(今|明|聽|昨|尋|琴)(早|朝|晚)|' +
+    '(今|明|前|大前|後|大後|聽|昨|尋|琴)(早|朝|晚)|' +
     '(上(?:午|晝)|朝(?:早)|早(?:上)|下(?:午|晝)|晏(?:晝)|晚(?:上)|夜(?:晚)?|中(?:午)|凌(?:晨))|' +
-    '(今|明|聽|昨|尋|琴)(?:日|天)' +
+    '(今|明|前|大前|後|大後|聽|昨|尋|琴)(?:日|天)' +
     '(?:[\\s|,|，]*)' +
     '(?:(上(?:午|晝)|朝(?:早)|早(?:上)|下(?:午|晝)|晏(?:晝)|晚(?:上)|夜(?:晚)?|中(?:午)|凌(?:晨)))?', 'i');
 
@@ -58,6 +58,14 @@ exports.Parser = function ZHHantCasualDateParser() {
               }
             } else if (day1 == '昨' || day1 == '尋' || day1 == '琴') {
                 startMoment.add(-1, 'day');
+            } else if (day1 == "前"){
+                startMoment.add(-2, 'day');
+            } else if (day1 == "大前"){
+                startMoment.add(-3, 'day');
+            } else if ( day1 == "後"){
+                startMoment.add(2, 'day');
+            } else if (day1 == "大後"){
+                startMoment.add(3, 'day');
             }
 
             if (time1 == '早' || time1 == '朝') {
@@ -95,6 +103,14 @@ exports.Parser = function ZHHantCasualDateParser() {
               }
             } else if (day3 == '昨' || day3 == '尋' || day3 == '琴') {
                 startMoment.add(-1, 'day');
+            } else if (day3 == "前"){
+                startMoment.add(-2, 'day');
+            } else if (day3 == "大前"){
+                startMoment.add(-3, 'day');
+            } else if (day3 == "後"){
+                startMoment.add(2, 'day');
+            } else if (day3 == "大後"){
+                startMoment.add(3, 'day');
             }
 
 

package/src/parsers/{ZH-Hant → zh-Hant}/ZHHantTimeExpressionParser.js

@@ -12,9 +12,9 @@ var util = require('../../utils/ZH-Hant.js');
 
 var patternString1 = '(?:由|從|自)?' +
     '(?:' +
-    '(今|明|聽|昨|尋|琴)(早|朝|晚)|' +
+    '(今|明|前|大前|後|大後|聽|昨|尋|琴)(早|朝|晚)|' +
     '(上(?:午|晝)|朝(?:早)|早(?:上)|下(?:午|晝)|晏(?:晝)|晚(?:上)|夜(?:晚)?|中(?:午)|凌(?:晨))|' +
-    '(今|明|聽|昨|尋|琴)(?:日|天)' +
+    '(今|明|前|大前|後|大後|聽|昨|尋|琴)(?:日|天)' +
     '(?:[\\s,，]*)' +
     '(?:(上(?:午|晝)|朝(?:早)|早(?:上)|下(?:午|晝)|晏(?:晝)|晚(?:上)|夜(?:晚)?|中(?:午)|凌(?:晨)))?' +
     ')?' +
@@ -28,9 +28,9 @@ var patternString1 = '(?:由|從|自)?' +
 
 var patternString2 = '(?:\\s*(?:到|至|\\-|\\–|\\~|\\〜)\\s*)' +
     '(?:' +
-    '(今|明|聽|昨|尋|琴)(早|朝|晚)|' +
+    '(今|明|前|大前|後|大後|聽|昨|尋|琴)(早|朝|晚)|' +
     '(上(?:午|晝)|朝(?:早)|早(?:上)|下(?:午|晝)|晏(?:晝)|晚(?:上)|夜(?:晚)?|中(?:午)|凌(?:晨))|' +
-    '(今|明|聽|昨|尋|琴)(?:日|天)' +
+    '(今|明|前|大前|後|大後|聽|昨|尋|琴)(?:日|天)' +
     '(?:[\\s,，]*)' +
     '(?:(上(?:午|晝)|朝(?:早)|早(?:上)|下(?:午|晝)|晏(?:晝)|晚(?:上)|夜(?:晚)?|中(?:午)|凌(?:晨)))?' +
     ')?' +
@@ -86,6 +86,14 @@ exports.Parser = function ZHHantTimeExpressionParser() {
               }
             } else if (day1 == '昨' || day1 == '尋' || day1 == '琴') {
                 startMoment.add(-1, 'day');
+            } else if (day1 == "前"){
+                startMoment.add(-2, 'day');
+            } else if (day1 == "大前"){
+                startMoment.add(-3, 'day');
+            } else if (day1 == "後"){
+                startMoment.add(2, 'day');
+            } else if (day1 == "大後"){
+                startMoment.add(3, 'day');
             }
             result.start.assign('day', startMoment.date());
             result.start.assign('month', startMoment.month() + 1);
@@ -96,6 +104,14 @@ exports.Parser = function ZHHantTimeExpressionParser() {
                 startMoment.add(1, 'day');
             } else if (day3 == '昨' || day3 == '尋' || day3 == '琴') {
                 startMoment.add(-1, 'day');
+            } else if (day3 == "前"){
+                startMoment.add(-2, 'day');
+            } else if (day3 == "大前"){
+                startMoment.add(-3, 'day');
+            } else if (day3 == "後"){
+                startMoment.add(2, 'day');
+            } else if (day3 == "大後"){
+                startMoment.add(3, 'day');
             }
             result.start.assign('day', startMoment.date());
             result.start.assign('month', startMoment.month() + 1);
@@ -237,6 +253,14 @@ exports.Parser = function ZHHantTimeExpressionParser() {
               }
             } else if (day1 == '昨' || day1 == '尋' || day1 == '琴') {
                 endMoment.add(-1, 'day');
+            } else if (day1 == "前"){
+                endMoment.add(-2, 'day');
+            } else if (day1 == "大前"){
+                endMoment.add(-3, 'day');
+            } else if (day1 == "後"){
+                endMoment.add(2, 'day');
+            } else if (day1 == "大後"){
+                endMoment.add(3, 'day');
             }
             result.end.assign('day', endMoment.date());
             result.end.assign('month', endMoment.month() + 1);
@@ -247,6 +271,14 @@ exports.Parser = function ZHHantTimeExpressionParser() {
                 endMoment.add(1, 'day');
             } else if (day3 == '昨' || day3 == '尋' || day3 == '琴') {
                 endMoment.add(-1, 'day');
+            } else if (day3 == "前"){
+                endMoment.add(-2, 'day');
+            } else if (day3 == "大前"){
+                endMoment.add(-3, 'day');
+            } else if (day3 == "後"){
+                endMoment.add(2, 'day');
+            } else if (day3 == "大後"){
+                endMoment.add(3, 'day');
             }
             result.end.assign('day', endMoment.date());
             result.end.assign('month', endMoment.month() + 1);

package/src/parsers/{ZH-Hant → zh-Hant}/ZHHantWeekdayParser.js

@@ -6,7 +6,7 @@
 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 util = require('../../utils/ZH-Hant.js');
 

package/src/refiners/ExtractTimezoneAbbrRefiner.js

@@ -4,28 +4,40 @@
 var Refiner = require('./refiner').Refiner;
 
 // Map ABBR -> Offset in minute
-var TIMEZONE_ABBR_MAP = {};
 var TIMEZONE_NAME_PATTERN = new RegExp("^\\s*\\(?([A-Z]{2,4})\\)?(?=\\W|$)", 'i');
+var DEFAULT_TIMEZONE_ABBR_MAP = {
+    "ACDT":630,"ACST":570,"ADT":-180,"AEDT":660,"AEST":600,"AFT":270,"AKDT":-480,"AKST":-540,"ALMT":360,"AMST":-180,"AMT":-240,"ANAST":720,"ANAT":720,"AQTT":300,"ART":-180,"AST":-240,"AWDT":540,"AWST":480,"AZOST":0,"AZOT":-60,"AZST":300,"AZT":240,"BNT":480,"BOT":-240,"BRST":-120,"BRT":-180,"BST":60,"BTT":360,"CAST":480,"CAT":120,"CCT":390,"CDT":-300,"CEST":120,"CET":60,"CHADT":825,"CHAST":765,"CKT":-600,"CLST":-180,"CLT":-240,"COT":-300,"CST":-360,"CVT":-60,"CXT":420,"ChST":600,"DAVT":420,"EASST":-300,"EAST":-360,"EAT":180,"ECT":-300,"EDT":-240,"EEST":180,"EET":120,"EGST":0,"EGT":-60,"EST":-300,"ET":-300,"FJST":780,"FJT":720,"FKST":-180,"FKT":-240,"FNT":-120,"GALT":-360,"GAMT":-540,"GET":240,"GFT":-180,"GILT":720,"GMT":0,"GST":240,"GYT":-240,"HAA":-180,"HAC":-300,"HADT":-540,"HAE":-240,"HAP":-420,"HAR":-360,"HAST":-600,"HAT":-90,"HAY":-480,"HKT":480,"HLV":-210,"HNA":-240,"HNC":-360,"HNE":-300,"HNP":-480,"HNR":-420,"HNT":-150,"HNY":-540,"HOVT":420,"ICT":420,"IDT":180,"IOT":360,"IRDT":270,"IRKST":540,"IRKT":540,"IRST":210,"IST":330,"JST":540,"KGT":360,"KRAST":480,"KRAT":480,"KST":540,"KUYT":240,"LHDT":660,"LHST":630,"LINT":840,"MAGST":720,"MAGT":720,"MART":-510,"MAWT":300,"MDT":-360,"MESZ":120,"MEZ":60,"MHT":720,"MMT":390,"MSD":240,"MSK":240,"MST":-420,"MUT":240,"MVT":300,"MYT":480,"NCT":660,"NDT":-90,"NFT":690,"NOVST":420,"NOVT":360,"NPT":345,"NST":-150,"NUT":-660,"NZDT":780,"NZST":720,"OMSST":420,"OMST":420,"PDT":-420,"PET":-300,"PETST":720,"PETT":720,"PGT":600,"PHOT":780,"PHT":480,"PKT":300,"PMDT":-120,"PMST":-180,"PONT":660,"PST":-480,"PT":-480,"PWT":540,"PYST":-180,"PYT":-240,"RET":240,"SAMT":240,"SAST":120,"SBT":660,"SCT":240,"SGT":480,"SRT":-180,"SST":-660,"TAHT":-600,"TFT":300,"TJT":300,"TKT":780,"TLT":540,"TMT":300,"TVT":720,"ULAT":480,"UTC":0,"UYST":-120,"UYT":-180,"UZT":300,"VET":-210,"VLAST":660,"VLAT":660,"VUT":660,"WAST":120,"WAT":60,"WEST":60,"WESZ":60,"WET":0,"WEZ":0,"WFT":720,"WGST":-120,"WGT":-180,"WIB":420,"WIT":540,"WITA":480,"WST":780,"WT":0,"YAKST":600,"YAKT":600,"YAPT":600,"YEKST":360,"YEKT":360
+};
 
-exports.Refiner = function ExtractTimezoneAbbrRefiner() {
-	Refiner.call(this);
+exports.Refiner = function ExtractTimezoneAbbrRefiner(config) {
+	Refiner.call(this, arguments);
 
 	this.refine = function(text, results, opt) {
 
+	    var timezones = new Object(DEFAULT_TIMEZONE_ABBR_MAP);
+	    if (opt.timezones) {
+	        for (var name in opt.timezones) {
+                timezones[name] = opt.timezones[name];
+            }
+        }
+
 		results.forEach(function(result) {
 
-            if (!result.tags['ENTimeExpressionParser'] && !result.tags['ZHTimeExpressionParser'] && !result.tags['FRTimeExpressionParser'] && !result.tags['DETimeExpressionParser']) {
+            if (!result.tags['ENTimeExpressionParser'] &&
+                !result.tags['ZHTimeExpressionParser'] &&
+                !result.tags['FRTimeExpressionParser'] &&
+                !result.tags['DETimeExpressionParser']) {
                 return;
             }
 
             var match = TIMEZONE_NAME_PATTERN.exec(text.substring(result.index + result.text.length));
             if (match) {
                 var timezoneAbbr = match[1].toUpperCase();
-                if (TIMEZONE_ABBR_MAP[timezoneAbbr] === undefined) {
+                if (timezones[timezoneAbbr] === undefined) {
                     return;
                 }
 
-                var timezoneOffset = TIMEZONE_ABBR_MAP[timezoneAbbr];
+                var timezoneOffset = timezones[timezoneAbbr];
                 if (!result.start.isCertain('timezoneOffset')) {
                     result.start.assign('timezoneOffset', timezoneOffset);
                 }
@@ -41,7 +53,4 @@ exports.Refiner = function ExtractTimezoneAbbrRefiner() {
 
         return results;
 	}
-}
-
-// TODO: Move this to some configuration
-TIMEZONE_ABBR_MAP = {"ACDT":630,"ACST":570,"ADT":-180,"AEDT":660,"AEST":600,"AFT":270,"AKDT":-480,"AKST":-540,"ALMT":360,"AMST":-180,"AMT":-240,"ANAST":720,"ANAT":720,"AQTT":300,"ART":-180,"AST":-240,"AWDT":540,"AWST":480,"AZOST":0,"AZOT":-60,"AZST":300,"AZT":240,"BNT":480,"BOT":-240,"BRST":-120,"BRT":-180,"BST":60,"BTT":360,"CAST":480,"CAT":120,"CCT":390,"CDT":-300,"CEST":120,"CET":60,"CHADT":825,"CHAST":765,"CKT":-600,"CLST":-180,"CLT":-240,"COT":-300,"CST":-360,"CVT":-60,"CXT":420,"ChST":600,"DAVT":420,"EASST":-300,"EAST":-360,"EAT":180,"ECT":-300,"EDT":-240,"EEST":180,"EET":120,"EGST":0,"EGT":-60,"EST":-300,"ET":-300,"FJST":780,"FJT":720,"FKST":-180,"FKT":-240,"FNT":-120,"GALT":-360,"GAMT":-540,"GET":240,"GFT":-180,"GILT":720,"GMT":0,"GST":240,"GYT":-240,"HAA":-180,"HAC":-300,"HADT":-540,"HAE":-240,"HAP":-420,"HAR":-360,"HAST":-600,"HAT":-90,"HAY":-480,"HKT":480,"HLV":-210,"HNA":-240,"HNC":-360,"HNE":-300,"HNP":-480,"HNR":-420,"HNT":-150,"HNY":-540,"HOVT":420,"ICT":420,"IDT":180,"IOT":360,"IRDT":270,"IRKST":540,"IRKT":540,"IRST":210,"IST":60,"JST":540,"KGT":360,"KRAST":480,"KRAT":480,"KST":540,"KUYT":240,"LHDT":660,"LHST":630,"LINT":840,"MAGST":720,"MAGT":720,"MART":-510,"MAWT":300,"MDT":-360,"MESZ":120,"MEZ":60,"MHT":720,"MMT":390,"MSD":240,"MSK":240,"MST":-420,"MUT":240,"MVT":300,"MYT":480,"NCT":660,"NDT":-90,"NFT":690,"NOVST":420,"NOVT":360,"NPT":345,"NST":-150,"NUT":-660,"NZDT":780,"NZST":720,"OMSST":420,"OMST":420,"PDT":-420,"PET":-300,"PETST":720,"PETT":720,"PGT":600,"PHOT":780,"PHT":480,"PKT":300,"PMDT":-120,"PMST":-180,"PONT":660,"PST":-480,"PT":-480,"PWT":540,"PYST":-180,"PYT":-240,"RET":240,"SAMT":240,"SAST":120,"SBT":660,"SCT":240,"SGT":480,"SRT":-180,"SST":-660,"TAHT":-600,"TFT":300,"TJT":300,"TKT":780,"TLT":540,"TMT":300,"TVT":720,"ULAT":480,"UTC":0,"UYST":-120,"UYT":-180,"UZT":300,"VET":-210,"VLAST":660,"VLAT":660,"VUT":660,"WAST":120,"WAT":60,"WEST":60,"WESZ":60,"WET":0,"WEZ":0,"WFT":720,"WGST":-120,"WGT":-180,"WIB":420,"WIT":540,"WITA":480,"WST":780,"WT":0,"YAKST":600,"YAKT":600,"YAPT":600,"YEKST":360,"YEKT":360}
+};

package/src/refiners/ForwardDateRefiner.js

@@ -11,7 +11,7 @@ exports.Refiner = function ForwardDateRefiner() {
 
     this.refine = function(text, results, opt) {
 
-        if (!opt['forwardDate'] && !opt['forwardDatesOnly']) {
+        if (!opt['forwardDate']) {
             return results;
         }
 

package/src/refiners/{DE → de}/DEMergeDateRangeRefiner.js

@@ -1,7 +1,7 @@
 /*
   
 */
-var ENMergeDateRangeRefiner = require('../EN/ENMergeDateRangeRefiner').Refiner;
+var ENMergeDateRangeRefiner = require('../en/ENMergeDateRangeRefiner').Refiner;
 
 exports.Refiner = function DEMergeDateRangeRefiner() {
     ENMergeDateRangeRefiner.call(this);

package/src/refiners/{DE → de}/DEMergeDateTimeRefiner.js

@@ -4,9 +4,9 @@
 var ParsedComponents = require('../../result').ParsedComponents;
 var Refiner = require('../refiner').Refiner;
 
-var mergeDateTimeComponent = require('../EN/ENMergeDateTimeRefiner').mergeDateTimeComponent;
-var isDateOnly = require('../EN/ENMergeDateTimeRefiner').isDateOnly;
-var isTimeOnly = require('../EN/ENMergeDateTimeRefiner').isTimeOnly;
+var mergeDateTimeComponent = require('../en/ENMergeDateTimeRefiner').mergeDateTimeComponent;
+var isDateOnly = require('../en/ENMergeDateTimeRefiner').isDateOnly;
+var isTimeOnly = require('../en/ENMergeDateTimeRefiner').isTimeOnly;
 
 var PATTERN = new RegExp("^\\s*(T|um|am|,|-)?\\s*$");
 

package/src/refiners/{EN → en}/ENMergeDateRangeRefiner.js

@@ -55,6 +55,8 @@ exports.Refiner = function ENMergeDateRangeRefiner() {
     this.mergeResult = function(text, fromResult, toResult) {
 
         if (!this.isWeekdayResult(fromResult) && !this.isWeekdayResult(toResult)) {
+            
+            var timeKeys = {'hour': true, 'minute': true, 'second': true};
 
             for (var key in toResult.start.knownValues) {
                 if (!fromResult.start.isCertain(key)) {
@@ -70,9 +72,25 @@ exports.Refiner = function ENMergeDateRangeRefiner() {
         }
 
         if (fromResult.start.date().getTime() > toResult.start.date().getTime()) {
-            var tmp = toResult;
-            toResult = fromResult;
-            fromResult = tmp;
+            
+            var fromMoment = fromResult.start.moment();
+            var toMoment = toResult.start.moment();
+
+            if (this.isWeekdayResult(fromResult) && fromMoment.clone().add(-7, 'days').isBefore(toMoment)) {
+                fromMoment = fromMoment.add(-7, 'days');
+                fromResult.start.imply('day', fromMoment.date());
+                fromResult.start.imply('month', fromMoment.month() + 1);
+                fromResult.start.imply('year', fromMoment.year());
+            } else if (this.isWeekdayResult(toResult) && toMoment.clone().add(7, 'days').isAfter(fromMoment)) {
+                toMoment = toMoment.add(7, 'days');
+                toResult.start.imply('day', toMoment.date());
+                toResult.start.imply('month', toMoment.month() + 1);
+                toResult.start.imply('year', toMoment.year());
+            } else {
+                var tmp = toResult;
+                toResult = fromResult;
+                fromResult = tmp;
+            }
         }
         
         fromResult.end = toResult.start;