chrono-node 1.3.5 → 1.3.11

package/test/zh/zh_hant_time_exp.test.js

@@ -0,0 +1,226 @@
+var chrono = require('../../src/chrono');
+
+test("Test - Single Expression", function() {
+
+
+    var text = "雞上午6點13分全部都係雞";
+    var results = chrono.parse(text, new Date(2012,7,10));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(1)
+        expect(result.text).toBe('上午6點13分')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.get('hour')).toBe(6)
+        expect(result.start.get('minute')).toBe(13)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 6, 13);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "雞後天凌晨全部都係雞";
+    var results = chrono.parse(text, new Date(2012, 7, 10, 0, 0));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(1)
+        expect(result.text).toBe('後天凌晨')
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 12, 0, 0);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "雞大前天凌晨全部都係雞";
+    var results = chrono.parse(text, new Date(2012, 7, 10, 0, 0));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(1)
+        expect(result.text).toBe('大前天凌晨')
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 7, 0, 0);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+
+});
+
+test("Test - Range Expression", function() {
+
+    var text = "雞由今朝八點十分至下午11點32分全部都係雞";
+    var results = chrono.parse(text, new Date(2012,7,10));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(1)
+        expect(result.text).toBe('由今朝八點十分至下午11點32分')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.get('hour')).toBe(8)
+        expect(result.start.get('minute')).toBe(10)
+
+        expect(result.start.isCertain('day')).toBe(true)
+        expect(result.start.isCertain('month')).toBe(true)
+        expect(result.start.isCertain('year')).toBe(true)
+        expect(result.start.isCertain('hour')).toBe(true)
+        expect(result.start.isCertain('minute')).toBe(true)
+        expect(result.start.isCertain('second')).toBe(false)
+        expect(result.start.isCertain('millisecond')).toBe(false)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 8, 10);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+
+        expect(result.end).not.toBeNull()
+        expect(result.end.get('hour')).toBe(23)
+        expect(result.end.get('minute')).toBe(32)
+
+        expect(result.end.isCertain('day')).toBe(false)
+        expect(result.end.isCertain('month')).toBe(false)
+        expect(result.end.isCertain('year')).toBe(false)
+        expect(result.end.isCertain('hour')).toBe(true)
+        expect(result.end.isCertain('minute')).toBe(true)
+        expect(result.end.isCertain('second')).toBe(false)
+        expect(result.end.isCertain('millisecond')).toBe(false)
+
+        var resultDate = result.end.date();
+        var expectDate = new Date(2012, 7, 10, 23, 32);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "6點30pm-11點pm";
+    var results = chrono.parse(text, new Date(2012,7,10));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(0)
+        expect(result.text).toBe('6點30pm-11點pm')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.get('hour')).toBe(18)
+        expect(result.start.get('minute')).toBe(30)
+        expect(result.start.get('meridiem')).toBe(1)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7, 10, 18, 30);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+
+        expect(result.end).not.toBeNull()
+        expect(result.end.get('hour')).toBe(23)
+        expect(result.end.get('minute')).toBe(0)
+        expect(result.end.get('meridiem')).toBe(1)
+
+        var resultDate = result.end.date();
+        var expectDate = new Date(2012, 7, 10, 23, 0);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+});
+
+test("Test - Date + Time Expression", function() {
+
+    var text = "雞二零一八年十一月廿六日下午三時半五十九秒全部都係雞";
+    var results = chrono.parse(text, new Date(2012,7,10));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if(result){
+        expect(result.index).toBe(1)
+        expect(result.text).toBe('二零一八年十一月廿六日下午三時半五十九秒')
+
+        expect(result.start.get('year')).toBe(2018)
+        expect(result.start.get('month')).toBe(11)
+        expect(result.start.get('day')).toBe(26)
+        expect(result.start.get('hour')).toBe(15)
+        expect(result.start.get('minute')).toBe(30)
+        expect(result.start.get('second')).toBe(59)
+        expect(result.start.get('millisecond')).toBe(0)
+        expect(result.start.isCertain('millisecond')).toBe(false)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2018, 11-1, 26, 15, 30, 59);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+})
+
+
+test("Test - Time Expression's Meridiem imply", function() {
+
+    var text = "1點pm到3點";
+    var results = chrono.parse(text, new Date(2012,7,10));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(0)
+        expect(result.text).toBe('1點pm到3點')
+
+        expect(result.start.get('year')).toBe(2012)
+        expect(result.start.get('month')).toBe(8)
+        expect(result.start.get('day')).toBe(10)
+        expect(result.start.get('hour')).toBe(13)
+        expect(result.start.get('minute')).toBe(0)
+        expect(result.start.get('second')).toBe(0)
+        expect(result.start.get('millisecond')).toBe(0)
+        expect(result.start.get('meridiem')).toBe(1)
+        expect(result.start.isCertain('meridiem')).toBe(true)
+
+        expect(result.end.get('year')).toBe(2012)
+        expect(result.end.get('month')).toBe(8)
+        expect(result.end.get('day')).toBe(11)
+        expect(result.end.get('hour')).toBe(3)
+        expect(result.end.get('minute')).toBe(0)
+        expect(result.end.get('second')).toBe(0)
+        expect(result.end.get('millisecond')).toBe(0)
+        expect(result.end.isCertain('meridiem')).toBe(false)
+    }
+})
+
+
+test("Test - Random date + time expression", function() {
+
+    var text = "2014年, 3月5日晏晝 6 點至 7 點";
+    var result = chrono.parse(text)[0];
+    expect(result.text).toBe(text)
+
+    var text = "下星期六凌晨1點30分廿九秒";
+    var result = chrono.parse(text)[0];
+    expect(result.text).toBe(text)
+
+    var text = "尋日朝早六點正";
+    var result = chrono.parse(text)[0];
+    expect(result.text).toBe(text)
+
+
+    var text = "六月四日3:00am";
+    var result = chrono.parse(text)[0];
+    expect(result.text).toBe(text)
+
+    var text = "上個禮拜五16時";
+    var result = chrono.parse(text)[0];
+    expect(result.text).toBe(text)
+
+    var text = "3月17日 20點15";
+    var result = chrono.parse(text)[0];
+    expect(result.text).toBe(text)
+
+    var text = "10點";
+    var result = chrono.parse(text)[0];
+    expect(result.text).toBe(text)
+
+    var text = "中午12點";
+    var result = chrono.parse(text)[0];
+    expect(result.text).toBe(text)
+    expect(result.start.get('hour')).toBe(12)
+    expect(result.start.get('hour')).toBe(12)
+})

package/test/zh/zh_hant_weekday.test.js

@@ -0,0 +1,160 @@
+var chrono = require('../../src/chrono');
+test("Test - Single Expression", function () {
+
+    var text = "星期四";
+    var results = chrono.casual.parse(text, new Date(2016, 9-1, 2));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe('星期四');
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get('year')).toBe(2016);
+        expect(result.start.get('month')).toBe(9);
+        expect(result.start.get('day')).toBe(1);
+        expect(result.start.get('weekday')).toBe(4);
+
+
+        expect(result.start.isCertain('day')).toBe(false);
+        expect(result.start.isCertain('month')).toBe(false);
+        expect(result.start.isCertain('year')).toBe(false);
+        expect(result.start.isCertain('weekday')).toBe(true);
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2016, 9-1, 1, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "禮拜四 (forward dates only)";
+    var results = chrono.casual.parse(text, new Date(2016, 9-1, 2), {forwardDate: true});
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe('禮拜四');
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get('year')).toBe(2016);
+        expect(result.start.get('month')).toBe(9);
+        expect(result.start.get('day')).toBe(8);
+        expect(result.start.get('weekday')).toBe(4);
+
+
+        expect(result.start.isCertain('day')).toBe(false);
+        expect(result.start.isCertain('month')).toBe(false);
+        expect(result.start.isCertain('year')).toBe(false);
+        expect(result.start.isCertain('weekday')).toBe(true);
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2016, 9-1, 8, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "禮拜日";
+    var results = chrono.casual.parse(text, new Date(2016, 9-1, 2));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe('禮拜日');
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get('year')).toBe(2016);
+        expect(result.start.get('month')).toBe(9);
+        expect(result.start.get('day')).toBe(4);
+        expect(result.start.get('weekday')).toBe(0);
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2016, 9-1, 4, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "雞上個禮拜三全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2016, 9-1, 2));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(1);
+        expect(result.text).toBe('上個禮拜三');
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get('year')).toBe(2016);
+        expect(result.start.get('month')).toBe(8);
+        expect(result.start.get('day')).toBe(24);
+        expect(result.start.get('weekday')).toBe(3);
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2016, 8-1, 24, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+
+    var text = "雞下星期天全部都係雞";
+    var results = chrono.casual.parse(text, new Date(2016, 9-1, 2));
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(1);
+        expect(result.text).toBe('下星期天');
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get('year')).toBe(2016);
+        expect(result.start.get('month')).toBe(9);
+        expect(result.start.get('day')).toBe(4);
+        expect(result.start.get('weekday')).toBe(0);
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2016, 9-1, 4, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+});
+
+test('Test - forward dates only option', function () {
+
+    var text = "星期六-星期一";
+    var results = chrono.casual.parse(text, new Date(2016, 9-1, 2), {forwardDate: true});
+    expect(results.length).toBe(1);
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(0);
+        expect(result.text).toBe('星期六-星期一');
+
+        expect(result.start).not.toBeNull();
+        expect(result.start.get('year')).toBe(2016);
+        expect(result.start.get('month')).toBe(9);
+        expect(result.start.get('day')).toBe(3);
+        expect(result.start.get('weekday')).toBe(6);
+
+        expect(result.start.isCertain('day')).toBe(false);
+        expect(result.start.isCertain('month')).toBe(false);
+        expect(result.start.isCertain('year')).toBe(false);
+        expect(result.start.isCertain('weekday')).toBe(true);
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2016, 9-1, 3, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+
+
+        expect(result.end).not.toBeNull();
+        expect(result.end.get('year')).toBe(2016);
+        expect(result.end.get('month')).toBe(9);
+        expect(result.end.get('day')).toBe(5);
+        expect(result.end.get('weekday')).toBe(1);
+
+        expect(result.end.isCertain('day')).toBe(false);
+        expect(result.end.isCertain('month')).toBe(false);
+        expect(result.end.isCertain('year')).toBe(false);
+        expect(result.end.isCertain('weekday')).toBe(true);
+
+        var resultDate = result.end.date();
+        var expectDate = new Date(2016, 9-1, 5, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+});

package/.npmignore

@@ -1,11 +0,0 @@
-# Node Modules
-node_modules/*
-
-# Coverages
-coverage/
-
-# Misc
-.Rhistory
-.idea/
-
-

package/src/parsers/EN/ENCasualTimeParser.js

@@ -1,53 +0,0 @@
-/*
-
-
-*/
-
-var moment = require('moment');
-var Parser = require('../parser').Parser;
-var ParsedResult = require('../../result').ParsedResult;
-
-var PATTERN = /(\W|^)((this)?\s*(morning|afternoon|evening|noon))/i;
-
-var TIME_MATCH = 4;
-
-exports.Parser = function ENCasualTimeParser(){
-
-    Parser.apply(this, arguments);
-
-
-    this.pattern = function() { return PATTERN; }
-
-    this.extract = function(text, ref, match, opt){
-
-        var text = match[0].substr(match[1].length);
-        var index = match.index + match[1].length;
-        var result = new ParsedResult({
-            index: index,
-            text: text,
-            ref: ref,
-        });
-
-        if(!match[TIME_MATCH]) TIME_MATCH = 3;
-
-        if (match[TIME_MATCH] == "afternoon") {
-
-            result.start.imply('hour', opt['afternoon'] ? opt['afternoon'] : 15);
-
-        } else if (match[TIME_MATCH] == "evening") {
-
-            result.start.imply('hour', opt['evening'] ? opt['evening'] : 18);
-
-        } else if (match[TIME_MATCH] == "morning") {
-
-            result.start.imply('hour', opt['morning'] ? opt['morning'] : 6);
-
-        } else if (match[TIME_MATCH] == "noon") {
-
-            result.start.imply('hour', opt['noon'] ? opt['noon'] : 12);
-        }
-
-        result.tags['ENCasualTimeParser'] = true;
-        return result;
-    };
-};

package/src/parsers/EN/ENTimeAgoFormatParser.js

@@ -1,130 +0,0 @@
-/*
-
-
-*/
-
-var moment = require('moment');
-var Parser = require('../parser').Parser;
-var ParsedResult = require('../../result').ParsedResult;
-var util  = require('../../utils/EN');
-
-var TIME_UNIT = 
-    '(' + util.INTEGER_WORDS_PATTERN + '|[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');
-var PATTERN = new RegExp('' +
-    '(\\W|^)' +
-    '(?:within\\s*)?' +
-    '((?:' + TIME_UNIT + ')+)' +
-    '(?:ago|before|earlier)(?=(?:\\W|$))', 'i');
-
-var STRICT_PATTERN = new RegExp('' +
-    '(\\W|^)' +
-    '(?:within\\s*)?' +
-    '((?:' + TIME_UNIT_STRICT + ')+)' +
-    'ago(?=(?:\\W|$))', 'i');
-
-exports.Parser = function ENTimeAgoFormatParser(){
-    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 text = match[0];
-        text  = match[0].substr(match[1].length, match[0].length - match[1].length);
-        index = match.index + match[1].length;
-
-        var result = new ParsedResult({
-            index: index,
-            text: text,
-            ref: ref
-        });
-
-        var fragments = extractDateTimeUnitFragments(match[2]);
-        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;
-    };
-
-    function extractDateTimeUnitFragments(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 (util.INTEGER_WORDS[num] !== undefined) {
-            num = util.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 = parseInt(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/src/parsers/EN/ENTimeFromNowFormatParser.js

@@ -1,119 +0,0 @@
-/*
-    Allows future dates according to 'days from now'
-    eg:
-    90 days from now
-    90 days forward
-    90 days out
-*/
-
-var moment = require('moment');
-var Parser = require('../parser').Parser;
-var ParsedResult = require('../../result').ParsedResult;
-var util  = require('../../utils/EN');
-
-var PATTERN = new RegExp('' +
-    '(\\W|^)' +
-    '(?:within\\s*)?' +
-    '(' + util.INTEGER_WORDS_PATTERN + '|[0-9]+|an?(?:\\s*few)?|half(?:\\s*an?)?)\\s*' +
-    '(seconds?|min(?:ute)?s?|hours?|weeks?|days?|months?|years?)\\s*' +
-    '(?:from now|henceforth|forward|out)(?=(?:\\W|$))', 'i');
-
-var STRICT_PATTERN = new RegExp('' +
-    '(\\W|^)' +
-    '(?:within\\s*)?' +
-    '([0-9]+|an?)\\s*' +
-    '(seconds?|minutes?|hours?|days?)\\s*' +
-    'from now(?=(?:\\W|$))', 'i');
-
-exports.Parser = function ENTimeFromNowFormatParser() {
-    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 text = match[0];
-        text  = match[0].substr(match[1].length, match[0].length - match[1].length);
-        index = match.index + match[1].length;
-
-        var result = new ParsedResult({
-            index: index,
-            text: text,
-            ref: ref
-        });
-
-        var num = match[2].toLowerCase() ;
-        if (util.INTEGER_WORDS[num] !== undefined) {
-            num = util.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 = parseInt(num);
-        }
-
-        var date = moment(ref);
-
-        if (match[3].match(/hour|min|second/i)) {
-            if (match[3].match(/hour/i)) {
-
-                date.add(+num, 'hour');
-
-            } else if (match[3].match(/min/i)) {
-
-                date.add(+num, 'minute');
-
-            } else if (match[3].match(/second/i)) {
-
-                date.add(+num, 'second');
-            }
-
-            result.start.imply('day', date.date());
-            result.start.imply('month', date.month() + 1);
-            result.start.imply('year', date.year());
-            result.start.assign('hour', date.hour());
-            result.start.assign('minute', date.minute());
-            result.start.assign('second', date.second());
-            result.tags['ENTimeFromNowFormatParser'] = true;
-            return result;
-        }
-
-        if (match[3].match(/week/i)) {
-            date.add(+num, 'week');
-
-            result.start.imply('day', date.date());
-            result.start.imply('month', date.month() + 1);
-            result.start.imply('year', date.year());
-            result.start.imply('weekday', date.day());
-            return result;
-        }
-
-        if (match[3].match(/day/i)) {
-            date.add(+num, 'd');
-        }
-
-        if (match[3].match(/month/i)) {
-            date.add(+num, 'month');
-        }
-
-        if (match[3].match(/year/i)) {
-
-            date.add(+num, 'year');
-        }
-
-        result.start.assign('day', date.date());
-        result.start.assign('month', date.month() + 1);
-        result.start.assign('year', date.year());
-        return result;
-
-    };
-}