chrono-node 1.3.2 → 1.3.11

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;

package/src/result.js

@@ -21,6 +21,8 @@ ParsedResult.prototype.clone = function() {
     if (this.end) {
         result.end = this.end.clone();
     }
+
+    return result
 }
 
 ParsedResult.prototype.hasPossibleDates = function() {
@@ -112,7 +114,7 @@ ParsedComponents.prototype.moment = function() {
 
     // Javascript Date Object return minus timezone offset
     var currentTimezoneOffset = dateMoment.utcOffset();
-    var targetTimezoneOffset = this.isCertain('timezoneOffset') ? 
+    var targetTimezoneOffset = this.get('timezoneOffset') !== undefined ? 
         this.get('timezoneOffset') : currentTimezoneOffset;
 
     var adjustTimezoneOffset = targetTimezoneOffset - currentTimezoneOffset;

package/src/timezone.js

@@ -0,0 +1,2 @@
+{"A":60,"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,"B":120,"BNT":480,"BOT":-240,"BRST":-120,"BRT":-180,"BST":60,"BTT":360,"C":180,"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,"D":240,"DAVT":420,"E":300,"EASST":-300,"EAST":-360,"EAT":180,"ECT":-300,"EDT":-240,"EEST":180,"EET":120,"EGST":0,"EGT":-60,"EST":-300,"ET":-300,"F":360,"FJST":780,"FJT":720,"FKST":-180,"FKT":-240,"FNT":-120,"G":420,"GALT":-360,"GAMT":-540,"GET":240,"GFT":-180,"GILT":720,"GMT":0,"GST":240,"GYT":-240,"H":480,"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,"I":540,"ICT":420,"IDT":180,"IOT":360,"IRDT":270,"IRKST":540,"IRKT":540,"IRST":210,"IST":60,"JST":540,"K":600,"KGT":360,"KRAST":480,"KRAT":480,"KST":540,"KUYT":240,"L":660,"LHDT":660,"LHST":630,"LINT":840,"M":720,"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,"N":-60,"NCT":660,"NDT":-90,"NFT":690,"NOVST":420,"NOVT":360,"NPT":345,"NST":-150,"NUT":-660,"NZDT":780,"NZST":720,"O":-120,"OMSST":420,"OMST":420,"P":-180,"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,"Q":-240,"R":-300,"RET":240,"S":-360,"SAMT":240,"SAST":120,"SBT":660,"SCT":240,"SGT":480,"SRT":-180,"SST":-660,"T":-420,"TAHT":-600,"TFT":300,"TJT":300,"TKT":780,"TLT":540,"TMT":300,"TVT":720,"U":-480,"ULAT":480,"UTC":0,"UYST":-120,"UYT":-180,"UZT":300,"V":-540,"VET":-210,"VLAST":660,"VLAT":660,"VUT":660,"W":-600,"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,"X":-660,"Y":-720,"YAKST":600,"YAKT":600,"YAPT":600,"YEKST":360,"YEKT":360,"Z":0}
+{"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/utils/EN.js

@@ -55,6 +55,10 @@ exports.MONTH_OFFSET = {
     'dec.': 12
 };
 
+exports.MONTH_PATTERN = '(?:' 
+    + Object.keys(exports.MONTH_OFFSET).join('|').replace(/\./g, '\\.')
+    + ')';
+
 exports.INTEGER_WORDS = {
     'one' : 1,
     'two' : 2,
@@ -69,7 +73,9 @@ exports.INTEGER_WORDS = {
     'eleven' : 11,
     'twelve' : 12
 };
-exports.INTEGER_WORDS_PATTERN = '(?:' + Object.keys(exports.INTEGER_WORDS).join('|') +')';
+exports.INTEGER_WORDS_PATTERN = '(?:' 
+    + Object.keys(exports.INTEGER_WORDS).join('|') 
+    +')';
 
 exports.ORDINAL_WORDS = {
     'first' : 1,
@@ -104,4 +110,64 @@ exports.ORDINAL_WORDS = {
     'thirtieth': 30,
     'thirty first': 31
 };
-exports.ORDINAL_WORDS_PATTERN = '(?:' + Object.keys(exports.ORDINAL_WORDS).join('|').replace(/ /g, '[ -]') + ')';
+exports.ORDINAL_WORDS_PATTERN = '(?:' 
+    + Object.keys(exports.ORDINAL_WORDS).join('|').replace(/ /g, '[ -]') 
+    + ')';
+
+var TIME_UNIT = 
+    '(' + exports.INTEGER_WORDS_PATTERN + '|[0-9]+|[0-9]+\.[0-9]+|an?(?:\\s*few)?|half(?:\\s*an?)?)\\s*' +
+    '(sec(?:onds?)?|min(?:ute)?s?|hours?|weeks?|days?|months?|years?)\\s*';
+
+var TIME_UNIT_STRICT = 
+    '(?:[0-9]+|an?)\\s*' +
+    '(?:seconds?|minutes?|hours?|days?)\\s*';
+
+var PATTERN_TIME_UNIT = new RegExp(TIME_UNIT, 'i');
+
+exports.TIME_UNIT_PATTERN = '(?:' + TIME_UNIT + ')+';
+exports.TIME_UNIT_STRICT_PATTERN = '(?:' + TIME_UNIT_STRICT + ')+';
+
+exports.extractDateTimeUnitFragments = function (timeunitText) {
+    var fragments = {};
+    var remainingText = timeunitText;
+    var match = PATTERN_TIME_UNIT.exec(remainingText);
+    while (match) {
+        collectDateTimeFragment(match, fragments);
+        remainingText = remainingText.substring(match[0].length);
+        match = PATTERN_TIME_UNIT.exec(remainingText);
+    }
+    return fragments;
+};
+
+function collectDateTimeFragment(match, fragments) {
+    var num = match[1].toLowerCase() ;
+    if (exports.INTEGER_WORDS[num] !== undefined) {
+        num = exports.INTEGER_WORDS[num];
+    } else if(num === 'a' || num === 'an'){
+        num = 1;
+    } else if (num.match(/few/)) {
+        num = 3;
+    } else if (num.match(/half/)) {
+        num = 0.5;
+    } else {
+        num = parseFloat(num);
+    }
+
+    if (match[2].match(/hour/i)) {
+        fragments['hour'] = num;
+    } else if (match[2].match(/min/i)) {
+        fragments['minute'] = num;
+    } else if (match[2].match(/sec/i)) {
+        fragments['second'] = num;
+    } else if (match[2].match(/week/i)) {
+        fragments['week'] = num;
+    } else if (match[2].match(/day/i)) {
+        fragments['d'] = num;
+    } else if (match[2].match(/month/i)) {
+        fragments['month'] = num;
+    } else if (match[2].match(/year/i)) {
+        fragments['year'] = num;
+    }
+
+    return fragments;
+}

package/test/de/de.test.js

@@ -0,0 +1,51 @@
+var chrono = require('../../src/chrono');
+test('Test - Random text', function() { 
+
+    var text = "...Donnerstag, 15. Dezember 2011 Best Available Rate "
+    var results = chrono.parse(text);
+    expect(results.length).toBeGreaterThanOrEqual(1)
+    expect(results[0].start.get('day')).toBe(15)
+    expect(results[0].start.get('month')).toBe(12)
+    expect(results[0].start.get('year')).toBe(2011)
+
+
+    var text = "9:00 bis 17:00, Dienstag, 20. Mai 2013"
+    var results = chrono.parse(text);
+    expect(results.length).toBe(1)
+    expect(results[0].start.get('hour')).toBe(9)
+    expect(results[0].end.get('hour')).toBe(17)
+    expect(results[0].end.get('meridiem')).toBe(1)
+    expect(results[0].end.get('day')).toBe(20)
+    expect(results[0].end.get('month')).toBe(5)
+    expect(results[0].end.get('year')).toBe(2013)
+});
+
+
+test('Test - German support in default setting', function() {
+
+    // German's formal text should be handle by default casual and strict
+
+    var text = "9:00 bis 17:00, Dienstag, 20. Mai 2013";
+
+    var results = chrono.parse(text);
+    expect(results.length).toBe(1);
+
+    var results = chrono.strict.parse(text);
+    expect(results.length).toBe(1);
+
+    var results = chrono.de.parse(text);
+    expect(results.length).toBe(1);
+
+    // German's casual text (e.g. "do" is abbreviation of "Donnerstag")should be skipped
+
+    var text = "Do";
+
+    var results = chrono.parse(text);
+    expect(results.length).toBe(0);
+
+    var results = chrono.strict.parse(text);
+    expect(results.length).toBe(0);
+
+    var results = chrono.de.parse(text);
+    expect(results.length).toBe(1);
+});