chrono-node 1.3.5 → 1.4.4

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

@@ -1,17 +1,12 @@
-/*
-
-
-*/
-
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
 var PATTERN = new RegExp(
     '(而家|立(?:刻|即)|即刻)|' +
-    '(今|明|聽|昨|尋|琴)(早|朝|晚)|' +
+    '(今|明|前|大前|後|大後|聽|昨|尋|琴)(早|朝|晚)|' +
     '(上(?:午|晝)|朝(?:早)|早(?:上)|下(?:午|晝)|晏(?:晝)|晚(?:上)|夜(?:晚)?|中(?:午)|凌(?:晨))|' +
-    '(今|明|聽|昨|尋|琴)(?:日|天)' +
+    '(今|明|前|大前|後|大後|聽|昨|尋|琴)(?:日|天)' +
     '(?:[\\s|,|，]*)' +
     '(?:(上(?:午|晝)|朝(?:早)|早(?:上)|下(?:午|晝)|晏(?:晝)|晚(?:上)|夜(?:晚)?|中(?:午)|凌(?:晨)))?', 'i');
 
@@ -39,8 +34,8 @@ exports.Parser = function ZHHantCasualDateParser() {
             ref: ref,
         });
 
-        var refMoment = moment(ref);
-        var startMoment = refMoment.clone();
+        var refMoment = dayjs(ref);
+        var startMoment = refMoment;
 
         if (match[NOW_GROUP]) {
             result.start.imply('hour', refMoment.hour());
@@ -53,11 +48,19 @@ exports.Parser = function ZHHantCasualDateParser() {
 
             if (day1 == '明' || day1 == '聽') {
               // Check not "Tomorrow" on late night
-              if(refMoment.hour() > 1) {
-                  startMoment.add(1, 'day');
-              }
+                if(refMoment.hour() > 1) {
+                    startMoment = startMoment.add(1, 'day');
+                }
             } else if (day1 == '昨' || day1 == '尋' || day1 == '琴') {
-                startMoment.add(-1, 'day');
+                startMoment = startMoment.add(-1, 'day');
+            } else if (day1 == "前"){
+                startMoment = startMoment.add(-2, 'day');
+            } else if (day1 == "大前"){
+                startMoment = startMoment.add(-3, 'day');
+            } else if ( day1 == "後"){
+                startMoment = startMoment.add(2, 'day');
+            } else if (day1 == "大後"){
+                startMoment = startMoment.add(3, 'day');
             }
 
             if (time1 == '早' || time1 == '朝') {
@@ -89,12 +92,20 @@ exports.Parser = function ZHHantCasualDateParser() {
             var day3 = match[DAY_GROUP_3];
 
             if (day3 == '明' || day3 == '聽') {
-              // Check not "Tomorrow" on late night
-              if(refMoment.hour() > 1) {
-                  startMoment.add(1, 'day');
-              }
+                // Check not "Tomorrow" on late night
+                if(refMoment.hour() > 1) {
+                    startMoment = startMoment.add(1, 'day');
+                }
             } else if (day3 == '昨' || day3 == '尋' || day3 == '琴') {
-                startMoment.add(-1, 'day');
+                startMoment = startMoment.add(-1, 'day');
+            } else if (day3 == "前"){
+                startMoment = startMoment.add(-2, 'day');
+            } else if (day3 == "大前"){
+                startMoment = startMoment.add(-3, 'day');
+            } else if (day3 == "後"){
+                startMoment = startMoment.add(2, 'day');
+            } else if (day3 == "大後"){
+                startMoment = startMoment.add(3, 'day');
             }
 
 

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

@@ -1,9 +1,4 @@
-/*
-
-
-*/
-
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
@@ -36,7 +31,7 @@ exports.Parser = function ZHHantDateParser() {
     };
 
     this.extract = function(text, ref, match, opt) {
-        var startMoment = moment(ref);
+        var startMoment = dayjs(ref);
         var result = new ParsedResult({
             text: match[0],
             index: match.index,

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

@@ -1,9 +1,4 @@
-/*
-
-
-*/
-
-var moment = require('moment');
+const dayjs = require('dayjs');
 var Parser = require('../parser').Parser;
 var ParsedResult = require('../../result').ParsedResult;
 
@@ -55,20 +50,20 @@ exports.Parser = function ZHHantCasualDateParser() {
         }
       }
 
-      var date = moment(ref);
+      var date = dayjs(ref);
       var unit = match[UNIT_GROUP];
       var unitAbbr = unit[0];
 
       if (unitAbbr.match(/[日天星禮月年]/)){
-        if(unitAbbr == '日' || unitAbbr == '天'){
-          date.add(number, 'd');
-        }else if(unitAbbr == '星' || unitAbbr == '禮'){
-          date.add(number * 7, 'd');
-        }else if(unitAbbr == '月'){
-          date.add(number, 'month');
-        }else if(unitAbbr == '年'){
-          date.add(number, 'year');
-        }
+          if(unitAbbr == '日' || unitAbbr == '天'){
+            date = date.add(number, 'd');
+          }else if(unitAbbr == '星' || unitAbbr == '禮'){
+            date = date.add(number * 7, 'd');
+          }else if(unitAbbr == '月'){
+            date = date.add(number, 'month');
+          }else if(unitAbbr == '年'){
+            date = date.add(number, 'year');
+          }
 
         result.start.assign('year', date.year());
         result.start.assign('month', date.month() + 1);
@@ -77,11 +72,11 @@ exports.Parser = function ZHHantCasualDateParser() {
       }
 
       if(unitAbbr == '秒'){
-        date.add(number, 'second');
+        date = date.add(number, 'second');
       }else if(unitAbbr == '分'){
-        date.add(number, 'minute');
+        date = date.add(number, 'minute');
       }else if(unitAbbr == '小' || unitAbbr == '鐘'){
-        date.add(number, 'hour');
+        date = date.add(number, 'hour');
       }
 
       result.start.imply('year', date.year());

package/src/parsers/{ZH-Hant → zh-Hant}/ZHHantTimeExpressionParser.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;
@@ -12,9 +7,9 @@ var util = require('../../utils/ZH-Hant.js');
 
 var patternString1 = '(?:由|從|自)?' +
     '(?:' +
-    '(今|明|聽|昨|尋|琴)(早|朝|晚)|' +
+    '(今|明|前|大前|後|大後|聽|昨|尋|琴)(早|朝|晚)|' +
     '(上(?:午|晝)|朝(?:早)|早(?:上)|下(?:午|晝)|晏(?:晝)|晚(?:上)|夜(?:晚)?|中(?:午)|凌(?:晨))|' +
-    '(今|明|聽|昨|尋|琴)(?:日|天)' +
+    '(今|明|前|大前|後|大後|聽|昨|尋|琴)(?:日|天)' +
     '(?:[\\s,，]*)' +
     '(?:(上(?:午|晝)|朝(?:早)|早(?:上)|下(?:午|晝)|晏(?:晝)|晚(?:上)|夜(?:晚)?|中(?:午)|凌(?:晨)))?' +
     ')?' +
@@ -28,9 +23,9 @@ var patternString1 = '(?:由|從|自)?' +
 
 var patternString2 = '(?:\\s*(?:到|至|\\-|\\–|\\~|\\〜)\\s*)' +
     '(?:' +
-    '(今|明|聽|昨|尋|琴)(早|朝|晚)|' +
+    '(今|明|前|大前|後|大後|聽|昨|尋|琴)(早|朝|晚)|' +
     '(上(?:午|晝)|朝(?:早)|早(?:上)|下(?:午|晝)|晏(?:晝)|晚(?:上)|夜(?:晚)?|中(?:午)|凌(?:晨))|' +
-    '(今|明|聽|昨|尋|琴)(?:日|天)' +
+    '(今|明|前|大前|後|大後|聽|昨|尋|琴)(?:日|天)' +
     '(?:[\\s,，]*)' +
     '(?:(上(?:午|晝)|朝(?:早)|早(?:上)|下(?:午|晝)|晏(?:晝)|晚(?:上)|夜(?:晚)?|中(?:午)|凌(?:晨)))?' +
     ')?' +
@@ -67,7 +62,7 @@ exports.Parser = function ZHHantTimeExpressionParser() {
 
         // 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;
@@ -86,6 +81,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 +99,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 +248,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 +266,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

@@ -1,12 +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 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

@@ -3,7 +3,7 @@
     e.g. "March 12-13 (without year)" or "Thursday", the refiner will try to adjust the result
     into the future instead of the past.
 */
-var moment = require('moment');
+var dayjs = require('dayjs');
 var Refiner = require('./refiner').Refiner;
 
 exports.Refiner = function ForwardDateRefiner() {
@@ -11,20 +11,18 @@ exports.Refiner = function ForwardDateRefiner() {
 
     this.refine = function(text, results, opt) {
 
-        if (!opt['forwardDate'] && !opt['forwardDatesOnly']) {
+        if (!opt['forwardDate']) {
             return results;
         }
 
         results.forEach(function(result) {
 
-            var refMoment = moment(result.ref);
+            var refMoment = dayjs(result.ref);
 
-            if (result.start.isCertain('day') && result.start.isCertain('month') &&
-                !result.start.isCertain('year') &&
-                refMoment.isAfter(result.start.moment())
+            if (result.start.isOnlyDayMonthComponent() && refMoment.isAfter(result.start.dayjs())
             ) {
                 // Adjust year into the future
-                for (var i=0; i < 3 && refMoment.isAfter(result.start.moment()); i++) {
+                for (var i=0; i < 3 && refMoment.isAfter(result.start.dayjs()); i++) {
                     result.start.imply('year', result.start.get('year') + 1);
 
                     if (result.end && !result.end.isCertain('year')) {
@@ -32,24 +30,21 @@ exports.Refiner = function ForwardDateRefiner() {
                     }
                 }
 
-                result.tags['ExtractTimezoneOffsetRefiner'] = true;
+                result.tags['ForwardDateRefiner'] = true;
             }
 
-            if (!result.start.isCertain('day') && !result.start.isCertain('month') && !result.start.isCertain('year') &&
-                result.start.isCertain('weekday') &&
-                refMoment.isAfter(result.start.moment())
-            ) {
+            if (result.start.isOnlyWeekdayComponent() && refMoment.isAfter(result.start.dayjs())) {
                 // Adjust date to the coming week
                 if (refMoment.day() > result.start.get('weekday')) {
-                    refMoment.day(result.start.get('weekday') + 7);
+                    refMoment = refMoment.day(result.start.get('weekday') + 7);
                 } else {
-                    refMoment.day(result.start.get('weekday'));
+                    refMoment = refMoment.day(result.start.get('weekday'));
                 }
 
                 result.start.imply('day', refMoment.date());
                 result.start.imply('month', refMoment.month() + 1);
                 result.start.imply('year', refMoment.year());
-                result.tags['ExtractTimezoneOffsetRefiner'] = true;
+                result.tags['ForwardDateRefiner'] = true;
             }
         });
 

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

@@ -48,13 +48,9 @@ exports.Refiner = function ENMergeDateRangeRefiner() {
         return textBetween.match(this.pattern());
     };
 
-    this.isWeekdayResult = function (result) {
-        return result.start.isCertain('weekday') && !result.start.isCertain('day');
-    };
-
     this.mergeResult = function(text, fromResult, toResult) {
 
-        if (!this.isWeekdayResult(fromResult) && !this.isWeekdayResult(toResult)) {
+        if (!fromResult.isOnlyWeekday() && !toResult.isOnlyWeekday()) {
             
             var timeKeys = {'hour': true, 'minute': true, 'second': true};
 
@@ -73,15 +69,15 @@ exports.Refiner = function ENMergeDateRangeRefiner() {
 
         if (fromResult.start.date().getTime() > toResult.start.date().getTime()) {
             
-            var fromMoment = fromResult.start.moment();
-            var toMoment = toResult.start.moment();
+            var fromMoment = fromResult.start.dayjs();
+            var toMoment = toResult.start.dayjs();
 
-            if (this.isWeekdayResult(fromResult) && fromMoment.clone().add(-7, 'days').isBefore(toMoment)) {
+            if (fromResult.isOnlyWeekday() && fromMoment.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)) {
+            } else if (toResult.isOnlyWeekday() && toMoment.add(7, 'days').isAfter(fromMoment)) {
                 toMoment = toMoment.add(7, 'days');
                 toResult.start.imply('day', toMoment.date());
                 toResult.start.imply('month', toMoment.month() + 1);

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

@@ -25,14 +25,27 @@ var mergeDateTimeComponent = exports.mergeDateTimeComponent = function(dateCompo
     if (timeComponent.isCertain('hour')) {
         dateTimeComponent.assign('hour', timeComponent.get('hour'));
         dateTimeComponent.assign('minute', timeComponent.get('minute'));
-        dateTimeComponent.assign('second', timeComponent.get('second'));
+
+        if (timeComponent.isCertain('second')) {
+            dateTimeComponent.assign('second', timeComponent.get('second'));
+
+            if (timeComponent.isCertain('millisecond')) {
+                dateTimeComponent.assign('millisecond', timeComponent.get('millisecond'));
+            } else {
+                dateTimeComponent.imply('millisecond', timeComponent.get('millisecond'));
+            }
+        } else {
+            dateTimeComponent.imply('second', timeComponent.get('second'));
+            dateTimeComponent.imply('millisecond', timeComponent.get('millisecond'));
+        }
+        
     } else {
         dateTimeComponent.imply('hour', timeComponent.get('hour'));
         dateTimeComponent.imply('minute', timeComponent.get('minute'));
         dateTimeComponent.imply('second', timeComponent.get('second'));
+        dateTimeComponent.imply('millisecond', timeComponent.get('millisecond'));
     }
 
-
     if (timeComponent.isCertain('meridiem')) {
         dateTimeComponent.assign('meridiem', timeComponent.get('meridiem'));
     } else if (

package/src/refiners/{FR → fr}/FRMergeDateTimeRefiner.js

@@ -3,7 +3,7 @@
 */
 var ParsedComponents = require('../../result').ParsedComponents;
 var Refiner = require('../refiner').Refiner;
-var mergeDateTimeComponent = require('../EN/ENMergeDateTimeRefiner').mergeDateTimeComponent;
+var mergeDateTimeComponent = require('../en/ENMergeDateTimeRefiner').mergeDateTimeComponent;
 
 var PATTERN = new RegExp("^\\s*(T|à|a|vers|de|,|-)?\\s*$");
 

package/src/refiners/{JP → ja}/JPMergeDateRangeRefiner.js

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

package/src/refiners/refiner.js

@@ -32,18 +32,18 @@ exports.ExtractTimezoneAbbrRefiner = require('./ExtractTimezoneAbbrRefiner').Ref
 exports.ForwardDateRefiner = require('./ForwardDateRefiner').Refiner;
 exports.UnlikelyFormatFilter = require('./UnlikelyFormatFilter').Refiner;
 
-// EN refiners
-exports.ENMergeDateTimeRefiner = require('./EN/ENMergeDateTimeRefiner').Refiner;
-exports.ENMergeDateRangeRefiner = require('./EN/ENMergeDateRangeRefiner').Refiner;
-exports.ENPrioritizeSpecificDateRefiner = require('./EN/ENPrioritizeSpecificDateRefiner').Refiner;
+// en refiners
+exports.ENMergeDateTimeRefiner = require('./en/ENMergeDateTimeRefiner').Refiner;
+exports.ENMergeDateRangeRefiner = require('./en/ENMergeDateRangeRefiner').Refiner;
+exports.ENPrioritizeSpecificDateRefiner = require('./en/ENPrioritizeSpecificDateRefiner').Refiner;
 
-// JP refiners
-exports.JPMergeDateRangeRefiner = require('./JP/JPMergeDateRangeRefiner').Refiner;
+// ja refiners
+exports.JPMergeDateRangeRefiner = require('./ja/JPMergeDateRangeRefiner').Refiner;
 
-// FR refiners
-exports.FRMergeDateRangeRefiner = require('./FR/FRMergeDateRangeRefiner').Refiner;
-exports.FRMergeDateTimeRefiner = require('./FR/FRMergeDateTimeRefiner').Refiner;
+// fr refiners
+exports.FRMergeDateRangeRefiner = require('./fr/FRMergeDateRangeRefiner').Refiner;
+exports.FRMergeDateTimeRefiner = require('./fr/FRMergeDateTimeRefiner').Refiner;
 
-// DE refiners
-exports.DEMergeDateRangeRefiner = require('./DE/DEMergeDateRangeRefiner').Refiner;
-exports.DEMergeDateTimeRefiner = require('./DE/DEMergeDateTimeRefiner').Refiner;
+// de refiners
+exports.DEMergeDateRangeRefiner = require('./de/DEMergeDateRangeRefiner').Refiner;
+exports.DEMergeDateTimeRefiner = require('./de/DEMergeDateTimeRefiner').Refiner;