chrono-node 1.4.7 → 1.4.9

package/package.json

@@ -11,7 +11,7 @@
     "testURL": "http://localhost/"
   },
   "license": "MIT",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "directories": {
     "source": "./src",
     "test": "./test"

package/src/chrono.js

@@ -1,95 +1,93 @@
-export class Chrono {
 
-    constructor(option) {
-        option = option || exports.options.casualOption();
-        this.parsers = new Object(option.parsers);
-        this.refiners = new Object(option.refiners);
-    }
+var options = exports.options = require('./options');
 
-    parse(text, refDate, opt) {
+exports.parser = require('./parsers/parser');
+exports.refiner = require('./refiners/refiner');
 
-        refDate = refDate || new Date();
-        opt = opt || {};
-        opt.forwardDate = opt.forwardDate || opt.forwardDate;
+exports.Parser = exports.parser.Parser;
+exports.Refiner = exports.refiner.Refiner;
+exports.Filter = exports.refiner.Filter;
 
-        var allResults = [];
+exports.ParsedResult = require('./result').ParsedResult;
+exports.ParsedComponents = require('./result').ParsedComponents;
 
-        this.parsers.forEach(function (parser) {
-            var results = parser.execute(text, refDate, opt);
-            allResults = allResults.concat(results);
-        });
+var Chrono = function(option) {
 
-        allResults.sort(function(a, b) {
-            return a.index - b.index;
-        });
+    option = option || exports.options.casualOption();
+    this.parsers = new Object(option.parsers);
+    this.refiners = new Object(option.refiners);
+};
 
-        this.refiners.forEach(function (refiner) {
-            allResults = refiner.refine(text, allResults, opt);
-        });
 
-        return allResults;
-    }
+Chrono.prototype.parse = function(text, refDate, opt) {
 
-    parseDate(text, refDate, opt) {
-        var results = this.parse(text, refDate, opt);
-        if (results.length > 0) {
-            return results[0].start.date();
-        }
-        return null;
-    }
-}
+    refDate = refDate || new Date();
+    opt = opt || {};
+    opt.forwardDate = opt.forwardDate || opt.forwardDate;
+    
+    var allResults = [];
 
-import * as _options from './options';
-import * as _parser from './parsers/parser';
-import * as _refiner from './refiners/refiner';
-import * as _result from './result';
+    this.parsers.forEach(function (parser) {
+        var results = parser.execute(text, refDate, opt);
+        allResults = allResults.concat(results);
+    });
 
-export const options = _options;
-export const parser = _parser;
-export const refiner = _refiner;
+    allResults.sort(function(a, b) {
+        return a.index - b.index;
+    });
 
-export const Parser = parser.Parser;
-export const Refiner = refiner.Refiner;
-export const Filter = refiner.Filter;
+    this.refiners.forEach(function (refiner) {
+        allResults = refiner.refine(text, allResults, opt);
+    });
+    
+    return allResults;
+};
 
-export const ParsedResult = _result.ParsedResult;
-export const ParsedComponents = _result.ParsedComponents;
 
-export const strict = new Chrono( options.strictOption() );
-export const casual = new Chrono( options.casualOption() );
+Chrono.prototype.parseDate = function(text, refDate, opt) {
+    var results = this.parse(text, refDate, opt);
+    if (results.length > 0) {
+        return results[0].start.date();
+    }
+    return null;
+};
+
+exports.Chrono = Chrono;
+exports.strict = new Chrono( options.strictOption() );
+exports.casual = new Chrono( options.casualOption() );
 
-export const en = new Chrono( options.mergeOptions([
+exports.en = new Chrono( options.mergeOptions([
     options.en.casual, options.commonPostProcessing]));
 
-export const en_GB = new Chrono( options.mergeOptions([
+exports.en_GB = new Chrono( options.mergeOptions([
     options.en_GB.casual, options.commonPostProcessing]));
 
-export const de = new Chrono( options.mergeOptions([
+exports.de = new Chrono( options.mergeOptions([
     options.de.casual, options.en, options.commonPostProcessing]));
 
-export const nl = new Chrono( options.mergeOptions([
+exports.nl = new Chrono( options.mergeOptions([
     options.nl.casual, options.en, options.commonPostProcessing]));
 
-export const pt = new Chrono( options.mergeOptions([
+exports.pt = new Chrono( options.mergeOptions([
     options.pt.casual, options.en, options.commonPostProcessing]));
 
-export const es = new Chrono( options.mergeOptions([
+exports.es = new Chrono( options.mergeOptions([
     options.es.casual, options.en, options.commonPostProcessing]));
 
-export const fr = new Chrono( options.mergeOptions([
+exports.fr = new Chrono( options.mergeOptions([
     options.fr.casual, options.en, options.commonPostProcessing]));
 
-export const ja = new Chrono( options.mergeOptions([
+exports.ja = new Chrono( options.mergeOptions([ 
     options.ja.casual, options.en, options.commonPostProcessing]));
 
 
-export function parse () {
-    return casual.parse.apply(casual, arguments);
-}
+exports.parse = function () {
+    return exports.casual.parse.apply(exports.casual, arguments);
+};
 
-export function parseDate() {
-    return casual.parseDate.apply(casual, arguments);
-}
+exports.parseDate = function () {
+    return exports.casual.parseDate.apply(exports.casual, arguments);
+};
 
 
 

package/src/options.js

@@ -1,7 +1,8 @@
-import * as parser from './parsers/parser';
-import * as refiner from './refiners/refiner';
+var parser = require('./parsers/parser');
+var refiner = require('./refiners/refiner');
 
-export function mergeOptions(options) {
+
+exports.mergeOptions = function(options) {
 
     var addedTypes = {};
     var mergedOption = {
@@ -35,10 +36,10 @@ export function mergeOptions(options) {
     });
 
     return mergedOption;
-}
+};
 
 
-export function commonPostProcessing() {
+exports.commonPostProcessing = function() {
     return {
         refiners: [
             // These should be after all other refiners
@@ -47,12 +48,12 @@ export function commonPostProcessing() {
             new refiner.UnlikelyFormatFilter()
         ]
     }
-}
+};
 
 
 // -------------------------------------------------------------
 
-export function strictOption() {
+exports.strictOption = function () {
     var strictConfig = {
         strict: true
     };
@@ -68,9 +69,9 @@ export function strictOption() {
         exports.zh,
         exports.commonPostProcessing
     ]);
-}
+};
 
-export function casualOption() {
+exports.casualOption = function () {
     return exports.mergeOptions([
         exports.en.casual,
         // Some German abbriviate overlap with common English
@@ -83,11 +84,11 @@ export function casualOption() {
         exports.zh,
         exports.commonPostProcessing
     ]);
-}
+};
 
 // -------------------------------------------------------------
 
-export const de = function(config) {
+exports.de = function(config) {
     return {
         parsers: [
             new parser.DEDeadlineFormatParser(config),
@@ -106,7 +107,7 @@ export const de = function(config) {
     }
 };
 
-de.casual = function() {
+exports.de.casual = function() {
     var option = exports.de({
         strict: false
     });
@@ -119,7 +120,7 @@ de.casual = function() {
 
 // -------------------------------------------------------------
 
-export const nl = function(config) {
+exports.nl = function(config) {
     return {
         parsers: [
             new parser.NLMonthNameLittleEndianParser(config),
@@ -136,7 +137,7 @@ export const nl = function(config) {
     }
 };
 
-nl.casual = function() {
+exports.nl.casual = function() {
     var option = exports.nl({
         strict: false
     });
@@ -151,7 +152,7 @@ nl.casual = function() {
 // -------------------------------------------------------------
 
 
-export const en = function(config) {
+exports.en = function(config) {
     return {
         parsers: [
             new parser.ENISOFormatParser(config),
@@ -178,7 +179,7 @@ export const en = function(config) {
     }
 };
 
-en.casual = function(config) {
+exports.en.casual = function(config) {
     config = config || {};
     config.strict = false;
     var option = exports.en(config);
@@ -192,21 +193,21 @@ en.casual = function(config) {
 };
 
 
-export const en_GB = function(config) {
+exports.en_GB = function(config) {
     config = config || {};
     config.littleEndian = true;
     return exports.en(config);
-};
+}
 
-en_GB.casual = function(config) {
+exports.en_GB.casual = function(config) {
     config = config || {};
     config.littleEndian = true;
     return exports.en.casual(config);
-};
+}
 
 // -------------------------------------------------------------
 
-export const ja = function() {
+exports.ja = function() {
     return {
         parsers: [
             new parser.JPStandardParser()
@@ -219,7 +220,7 @@ export const ja = function() {
     }
 };
 
-ja.casual = function() {
+exports.ja.casual = function() {
     var option = exports.ja();
     option.parsers.unshift(new parser.JPCasualDateParser());
     return option;
@@ -228,7 +229,7 @@ ja.casual = function() {
 // -------------------------------------------------------------
 
 
-export const pt = function(config) {
+exports.pt = function(config) {
     return {
         parsers: [
             new parser.PTTimeAgoFormatParser(config),
@@ -244,7 +245,7 @@ export const pt = function(config) {
     }
 };
 
-pt.casual = function() {
+exports.pt.casual = function() {
     var option = exports.pt({
         strict: false
     });
@@ -257,7 +258,7 @@ pt.casual = function() {
 // -------------------------------------------------------------
 
 
-export const es = function(config) {
+exports.es = function(config) {
     return {
         parsers: [
             new parser.ESTimeAgoFormatParser(config),
@@ -273,7 +274,7 @@ export const es = function(config) {
     }
 };
 
-es.casual = function() {
+exports.es.casual = function() {
     var option = exports.es({
         strict: false
     });
@@ -286,7 +287,7 @@ es.casual = function() {
 
 // -------------------------------------------------------------
 
-export const fr = function(config) {
+exports.fr = function(config) {
     return {
         parsers: [
             new parser.FRDeadlineFormatParser(config),
@@ -304,7 +305,7 @@ export const fr = function(config) {
     }
 };
 
-fr.casual = function() {
+exports.fr.casual = function() {
     var option = exports.fr({
         strict: false
     });
@@ -318,7 +319,7 @@ fr.casual = function() {
 
 // -------------------------------------------------------------
 
-export const zh = function() {
+exports.zh = function() {
     return {
         parsers: [
             new parser.ZHHantDateParser(),

package/src/parsers/en/ENDeadlineFormatParser.js

@@ -62,9 +62,9 @@ exports.Parser = function ENDeadlineFormatParser(){
                 date = date.add(num, 'year');
             }
 
-            result.start.imply('year', date.year());
-            result.start.imply('month', date.month() + 1);
-            result.start.imply('day', date.date());
+            result.start.assign('year', date.year());
+            result.start.assign('month', date.month() + 1);
+            result.start.assign('day', date.date());
             return result;
         }
 
@@ -81,12 +81,12 @@ exports.Parser = function ENDeadlineFormatParser(){
             date = date.add(num, 'second');
         }
 
-        result.start.imply('year', date.year());
-        result.start.imply('month', date.month() + 1);
-        result.start.imply('day', date.date());
-        result.start.imply('hour', date.hour());
-        result.start.imply('minute', date.minute());
-        result.start.imply('second', date.second());
+        result.start.assign('year', date.year());
+        result.start.assign('month', date.month() + 1);
+        result.start.assign('day', date.date());
+        result.start.assign('hour', date.hour());
+        result.start.assign('minute', date.minute());
+        result.start.assign('second', date.second());
         result.tags['ENDeadlineFormatParser'] = true;
         return result;
     };

package/src/result.js

@@ -1,155 +1,155 @@
-import dayjs from 'dayjs';
+const dayjs = require('dayjs');
 
-export class ParsedResult {
+function ParsedResult(result){
+    result = result || {};
 
-    constructor(result) {
-        result = result || {};
+    this.ref   = result.ref;
+    this.index = result.index;
+    this.text  = result.text;
+    this.tags  = result.tags || {};
 
-        this.ref   = result.ref;
-        this.index = result.index;
-        this.text  = result.text;
-        this.tags  = result.tags || {};
-
-        this.start = new ParsedComponents(result.start, result.ref);
-
-        if(result.end){
-            this.end = new ParsedComponents(result.end, result.ref);
-        }
+    this.start = new ParsedComponents(result.start, result.ref)
+    if(result.end){
+        this.end = new ParsedComponents(result.end, result.ref)
     }
+}
 
-    clone() {
-        var result = new ParsedResult(this);
-        result.tags = JSON.parse(JSON.stringify(this.tags));
-        result.start = this.start.clone();
-        if (this.end) {
-            result.end = this.end.clone();
-        }
-
-        return result
+ParsedResult.prototype.clone = function() {
+    var result = new ParsedResult(this);
+    result.tags = JSON.parse(JSON.stringify(this.tags));
+    result.start = this.start.clone();
+    if (this.end) {
+        result.end = this.end.clone();
     }
 
-    date() {
-        return this.start.date();
-    }
+    return result
+}
 
-    hasPossibleDates() {
-        return this.start.isPossibleDate() && (!this.end || this.end.isPossibleDate());
-    }
+ParsedResult.prototype.date = function() {
+    return this.start.date();
+}
 
-    isOnlyWeekday() {
-        return this.start.isOnlyWeekdayComponent();
-    }
+ParsedResult.prototype.hasPossibleDates = function() {
+    return this.start.isPossibleDate() && (!this.end || this.end.isPossibleDate());
+}
 
-    isOnlyDayMonth() {
-        return this.start.isOnlyDayMonthComponent();
-    }
+ParsedResult.prototype.isOnlyWeekday = function() {
+    return this.start.isOnlyWeekdayComponent();
 }
 
-export class ParsedComponents {
+ParsedResult.prototype.isOnlyDayMonth = function() {
+    return this.start.isOnlyDayMonthComponent();
+}
 
-    constructor(components, ref) {
-        this.knownValues = {};
-        this.impliedValues = {};
+function ParsedComponents (components, ref){
 
-        if (components) {
-            for (let key in components) {
-                this.knownValues[key] = components[key];
-            }
-        }
+    this.knownValues = {};
+    this.impliedValues = {};
 
-        if (ref) {
-            ref = dayjs(ref);
-            this.imply('day', ref.date());
-            this.imply('month', ref.month() + 1);
-            this.imply('year', ref.year())
+    if (components) {
+        for (let key in components) {
+            this.knownValues[key] = components[key];
         }
-
-
-        this.imply('hour', 12);
-        this.imply('minute', 0);
-        this.imply('second', 0);
-        this.imply('millisecond', 0);
     }
 
-    get(component) {
-        if (component in this.knownValues) return this.knownValues[component];
-        if (component in this.impliedValues) return this.impliedValues[component];
+    if (ref) {
+        ref = dayjs(ref);
+        this.imply('day', ref.date())
+        this.imply('month', ref.month() + 1)
+        this.imply('year', ref.year())
     }
+    
 
-    isCertain(component) {
-        return component in this.knownValues;
-    }
+    this.imply('hour', 12);
+    this.imply('minute', 0);
+    this.imply('second', 0);
+    this.imply('millisecond', 0);
+}
 
-    imply(component, value) {
-        if (component in this.knownValues) return;
-        this.impliedValues[component] = value;
-    }
+ParsedComponents.prototype.clone = function () {
+    var component = new ParsedComponents();
+    component.knownValues = JSON.parse(JSON.stringify(this.knownValues));
+    component.impliedValues = JSON.parse(JSON.stringify(this.impliedValues));
+    return component;
+};
 
-    assign(component, value) {
-        this.knownValues[component] = value;
-        delete this.impliedValues[component];
-    }
+ParsedComponents.prototype.get = function(component, value) {
+    if (component in this.knownValues) return this.knownValues[component];
+    if (component in this.impliedValues) return this.impliedValues[component];
+};
 
-    clone() {
-        const component = new ParsedComponents();
-        component.knownValues = JSON.parse(JSON.stringify(this.knownValues));
-        component.impliedValues = JSON.parse(JSON.stringify(this.impliedValues));
-        return component;
-    }
+ParsedComponents.prototype.assign = function(component, value) {
+    this.knownValues[component] = value;
+    delete this.impliedValues[component];
+};
 
-    isOnlyWeekdayComponent() {
-        return this.isCertain('weekday') && !this.isCertain('day') && !this.isCertain('month');
-    }
+ParsedComponents.prototype.imply = function(component, value) {
+    if (component in this.knownValues) return;
+    this.impliedValues[component] = value;
+};
 
-    isOnlyDayMonthComponent() {
-        return this.isCertain('day') && this.isCertain('month') && !this.isCertain('year');
-    }
+ParsedComponents.prototype.isCertain = function(component) {
+    return component in this.knownValues;
+};
 
-    isPossibleDate() {
-        var dateMoment = this.dayjs();
-        if (this.isCertain('timezoneOffset')) {
-            const adjustTimezoneOffset = this.get('timezoneOffset') - dateMoment.utcOffset();
-            dateMoment = dateMoment.add(adjustTimezoneOffset, 'minutes');
-        }
+ParsedComponents.prototype.isOnlyWeekdayComponent = function() {
+    return this.isCertain('weekday') && !this.isCertain('day') && !this.isCertain('month');
+};
 
-        if (dateMoment.get('year') != this.get('year')) return false;
-        if (dateMoment.get('month') != this.get('month')-1) return false;
-        if (dateMoment.get('date') != this.get('day')) return false;
-        if (dateMoment.get('hour') != this.get('hour')) return false;
-        if (dateMoment.get('minute') != this.get('minute')) return false;
+ParsedComponents.prototype.isOnlyDayMonthComponent = function() {
+    return this.isCertain('day') && this.isCertain('month') && !this.isCertain('year');
+};
 
-        return true;
+ParsedComponents.prototype.isPossibleDate = function() {
+    var dateMoment = this.dayjs();
+    if (this.isCertain('timezoneOffset')) {
+        const adjustTimezoneOffset = this.get('timezoneOffset') - dateMoment.utcOffset();
+        dateMoment = dateMoment.add(adjustTimezoneOffset, 'minutes');
     }
 
-    date() {
-        const result = this.dayjs();
-        return result.toDate();
-    }
+    if (dateMoment.get('year') != this.get('year')) return false;
+    if (dateMoment.get('month') != this.get('month')-1) return false;
+    if (dateMoment.get('date') != this.get('day')) return false;
+    if (dateMoment.get('hour') != this.get('hour')) return false;
+    if (dateMoment.get('minute') != this.get('minute')) return false;
 
-    dayjs() {
-        var result = dayjs();
+    return true;
+};
 
-        result = result.year(this.get('year'));
-        result = result.month(this.get('month') - 1);
-        result = result.date(this.get('day'));
-        result = result.hour(this.get('hour'));
-        result = result.minute(this.get('minute'));
-        result = result.second(this.get('second'));
-        result = result.millisecond(this.get('millisecond'));
+ParsedComponents.prototype.date = function() {
+    var result = this.dayjs();
+    return result.toDate();
+};
 
-        // Javascript Date Object return minus timezone offset
-        var currentTimezoneOffset = result.utcOffset();
-        var targetTimezoneOffset = this.get('timezoneOffset') !== undefined ?
-            this.get('timezoneOffset') : currentTimezoneOffset;
 
-        var adjustTimezoneOffset = targetTimezoneOffset - currentTimezoneOffset;
-        result = result.add(-adjustTimezoneOffset, 'minute');
+ParsedComponents.prototype.dayjs = function() {
+    var result = dayjs();
 
-        return result;
-    }
+    result = result.year(this.get('year'));
+    result = result.month(this.get('month') - 1);
+    result = result.date(this.get('day'));
+    result = result.hour(this.get('hour'));
+    result = result.minute(this.get('minute'));
+    result = result.second(this.get('second'));
+    result = result.millisecond(this.get('millisecond'));
 
-    moment() {
-        // Keep for compatibility
-        return this.dayjs();
-    }
-}
+    // Javascript Date Object return minus timezone offset
+    var currentTimezoneOffset = result.utcOffset();
+    var targetTimezoneOffset = this.get('timezoneOffset') !== undefined ? 
+        this.get('timezoneOffset') : currentTimezoneOffset;
+
+    var adjustTimezoneOffset = targetTimezoneOffset - currentTimezoneOffset;
+    result = result.add(-adjustTimezoneOffset, 'minute');
+
+    return result;
+};
+
+ParsedComponents.prototype.moment = function() {
+    // Keep for compatibility
+    return this.dayjs();
+};
+
+
+
+exports.ParsedComponents = ParsedComponents;
+exports.ParsedResult = ParsedResult;