chrono-node 2.8.4 → 2.9.0

package/src/locales/zh/hans/parsers/ZHHansCasualDateParser.ts

@@ -1,4 +1,3 @@
-import dayjs from "dayjs";
 import { ParsingContext } from "../../../../chrono";
 import { AbstractParserWithWordBoundaryChecking } from "../../../../common/parsers/AbstractParserWithWordBoundary";
 import { ParsingComponents, ParsingResult } from "../../../../results";
@@ -27,33 +26,33 @@ export default class ZHHansCasualDateParser extends AbstractParserWithWordBounda
         const index = match.index;
         const result = context.createParsingResult(index, match[0]);
 
-        const refMoment = dayjs(context.refDate);
-        let startMoment = refMoment;
+        const refDate = context.refDate;
+        let date = new Date(refDate.getTime());
 
         if (match[NOW_GROUP]) {
-            result.start.imply("hour", refMoment.hour());
-            result.start.imply("minute", refMoment.minute());
-            result.start.imply("second", refMoment.second());
-            result.start.imply("millisecond", refMoment.millisecond());
+            result.start.imply("hour", refDate.getHours());
+            result.start.imply("minute", refDate.getMinutes());
+            result.start.imply("second", refDate.getSeconds());
+            result.start.imply("millisecond", refDate.getMilliseconds());
         } else if (match[DAY_GROUP_1]) {
             const day1 = match[DAY_GROUP_1];
             const time1 = match[TIME_GROUP_1];
 
             if (day1 == "明") {
                 // Check not "Tomorrow" on late night
-                if (refMoment.hour() > 1) {
-                    startMoment = startMoment.add(1, "day");
+                if (refDate.getHours() > 1) {
+                    date.setDate(date.getDate() + 1);
                 }
             } else if (day1 == "昨") {
-                startMoment = startMoment.add(-1, "day");
+                date.setDate(date.getDate() - 1);
             } else if (day1 == "前") {
-                startMoment = startMoment.add(-2, "day");
+                date.setDate(date.getDate() - 2);
             } else if (day1 == "大前") {
-                startMoment = startMoment.add(-3, "day");
+                date.setDate(date.getDate() - 3);
             } else if (day1 == "后") {
-                startMoment = startMoment.add(2, "day");
+                date.setDate(date.getDate() + 2);
             } else if (day1 == "大后") {
-                startMoment = startMoment.add(3, "day");
+                date.setDate(date.getDate() + 3);
             }
 
             if (time1 == "早") {
@@ -84,19 +83,19 @@ export default class ZHHansCasualDateParser extends AbstractParserWithWordBounda
 
             if (day3 == "明") {
                 // Check not "Tomorrow" on late night
-                if (refMoment.hour() > 1) {
-                    startMoment = startMoment.add(1, "day");
+                if (refDate.getHours() > 1) {
+                    date.setDate(date.getDate() + 1);
                 }
             } else if (day3 == "昨") {
-                startMoment = startMoment.add(-1, "day");
+                date.setDate(date.getDate() - 1);
             } else if (day3 == "前") {
-                startMoment = startMoment.add(-2, "day");
+                date.setDate(date.getDate() - 2);
             } else if (day3 == "大前") {
-                startMoment = startMoment.add(-3, "day");
+                date.setDate(date.getDate() - 3);
             } else if (day3 == "后") {
-                startMoment = startMoment.add(2, "day");
+                date.setDate(date.getDate() + 2);
             } else if (day3 == "大后") {
-                startMoment = startMoment.add(3, "day");
+                date.setDate(date.getDate() + 3);
             }
 
             const timeString3 = match[TIME_GROUP_3];
@@ -119,9 +118,9 @@ export default class ZHHansCasualDateParser extends AbstractParserWithWordBounda
             }
         }
 
-        result.start.assign("day", startMoment.date());
-        result.start.assign("month", startMoment.month() + 1);
-        result.start.assign("year", startMoment.year());
+        result.start.assign("day", date.getDate());
+        result.start.assign("month", date.getMonth() + 1);
+        result.start.assign("year", date.getFullYear());
 
         return result;
     }

package/src/locales/zh/hans/parsers/ZHHansDateParser.ts

@@ -1,4 +1,3 @@
-import dayjs from "dayjs";
 import { ParsingContext } from "../../../../chrono";
 import { AbstractParserWithWordBoundaryChecking } from "../../../../common/parsers/AbstractParserWithWordBoundary";
 import { NUMBER, zhStringToNumber, zhStringToYear } from "../constants";
@@ -44,7 +43,6 @@ export default class ZHHansDateParser extends AbstractParserWithWordBoundaryChec
     }
 
     innerExtract(context: ParsingContext, match: RegExpMatchArray) {
-        const startMoment = dayjs(context.refDate);
         const result = context.createParsingResult(match.index, match[0]);
 
         //Month
@@ -58,7 +56,7 @@ export default class ZHHansDateParser extends AbstractParserWithWordBoundaryChec
             if (isNaN(day)) day = zhStringToNumber(match[DAY_GROUP]);
             result.start.assign("day", day);
         } else {
-            result.start.imply("day", startMoment.date());
+            result.start.imply("day", context.refDate.getDate());
         }
 
         //Year
@@ -67,7 +65,7 @@ export default class ZHHansDateParser extends AbstractParserWithWordBoundaryChec
             if (isNaN(year)) year = zhStringToYear(match[YEAR_GROUP]);
             result.start.assign("year", year);
         } else {
-            result.start.imply("year", startMoment.year());
+            result.start.imply("year", context.refDate.getFullYear());
         }
 
         return result;

package/src/locales/zh/hans/parsers/ZHHansDeadlineFormatParser.ts

@@ -1,6 +1,6 @@
-import dayjs from "dayjs";
 import { ParsingContext } from "../../../../chrono";
 import { AbstractParserWithWordBoundaryChecking } from "../../../../common/parsers/AbstractParserWithWordBoundary";
+import { addDuration, Duration } from "../../../../calculation/duration";
 import { NUMBER, zhStringToNumber } from "../constants";
 
 const PATTERN = new RegExp(
@@ -41,41 +41,43 @@ export default class ZHHansDeadlineFormatParser extends AbstractParserWithWordBo
             }
         }
 
-        let date = dayjs(context.refDate);
+        const duration: Duration = {};
         const unit = match[UNIT_GROUP];
         const unitAbbr = unit[0];
 
         if (unitAbbr.match(/[日天星礼月年]/)) {
             if (unitAbbr == "日" || unitAbbr == "天") {
-                date = date.add(number, "d");
+                duration.day = number;
             } else if (unitAbbr == "星" || unitAbbr == "礼") {
-                date = date.add(number * 7, "d");
+                duration.week = number;
             } else if (unitAbbr == "月") {
-                date = date.add(number, "month");
+                duration.month = number;
             } else if (unitAbbr == "年") {
-                date = date.add(number, "year");
+                duration.year = number;
             }
 
-            result.start.assign("year", date.year());
-            result.start.assign("month", date.month() + 1);
-            result.start.assign("day", date.date());
+            const date = addDuration(context.refDate, duration);
+            result.start.assign("year", date.getFullYear());
+            result.start.assign("month", date.getMonth() + 1);
+            result.start.assign("day", date.getDate());
             return result;
         }
 
         if (unitAbbr == "秒") {
-            date = date.add(number, "second");
+            duration.second = number;
         } else if (unitAbbr == "分") {
-            date = date.add(number, "minute");
+            duration.minute = number;
         } else if (unitAbbr == "小" || unitAbbr == "钟") {
-            date = date.add(number, "hour");
+            duration.hour = number;
         }
 
-        result.start.imply("year", date.year());
-        result.start.imply("month", date.month() + 1);
-        result.start.imply("day", date.date());
-        result.start.assign("hour", date.hour());
-        result.start.assign("minute", date.minute());
-        result.start.assign("second", date.second());
+        const date = addDuration(context.refDate, duration);
+        result.start.imply("year", date.getFullYear());
+        result.start.imply("month", date.getMonth() + 1);
+        result.start.imply("day", date.getDate());
+        result.start.assign("hour", date.getHours());
+        result.start.assign("minute", date.getMinutes());
+        result.start.assign("second", date.getSeconds());
         return result;
     }
 }

package/src/locales/zh/hans/parsers/ZHHansRelationWeekdayParser.ts

@@ -1,4 +1,3 @@
-import dayjs from "dayjs";
 import { ParsingContext } from "../../../../chrono";
 import { AbstractParserWithWordBoundaryChecking } from "../../../../common/parsers/AbstractParserWithWordBoundary";
 import { ParsingResult } from "../../../../results";
@@ -31,37 +30,38 @@ export default class ZHHansRelationWeekdayParser extends AbstractParserWithWordB
             modifier = "this";
         }
 
-        let startMoment = dayjs(context.refDate);
+        const date = new Date(context.refDate.getTime());
         let startMomentFixed = false;
-        const refOffset = startMoment.day();
+        const refOffset = date.getDay();
 
         if (modifier == "last" || modifier == "past") {
-            startMoment = startMoment.day(offset - 7);
+            date.setDate(date.getDate() + (offset - 7 - refOffset));
             startMomentFixed = true;
         } else if (modifier == "next") {
-            startMoment = startMoment.day(offset + 7);
+            date.setDate(date.getDate() + (offset + 7 - refOffset));
             startMomentFixed = true;
         } else if (modifier == "this") {
-            startMoment = startMoment.day(offset);
+            date.setDate(date.getDate() + (offset - refOffset));
         } else {
-            if (Math.abs(offset - 7 - refOffset) < Math.abs(offset - refOffset)) {
-                startMoment = startMoment.day(offset - 7);
-            } else if (Math.abs(offset + 7 - refOffset) < Math.abs(offset - refOffset)) {
-                startMoment = startMoment.day(offset + 7);
-            } else {
-                startMoment = startMoment.day(offset);
+            let diff = offset - refOffset;
+            if (Math.abs(diff - 7) < Math.abs(diff)) {
+                diff -= 7;
             }
+            if (Math.abs(diff + 7) < Math.abs(diff)) {
+                diff += 7;
+            }
+            date.setDate(date.getDate() + diff);
         }
 
         result.start.assign("weekday", offset);
         if (startMomentFixed) {
-            result.start.assign("day", startMoment.date());
-            result.start.assign("month", startMoment.month() + 1);
-            result.start.assign("year", startMoment.year());
+            result.start.assign("day", date.getDate());
+            result.start.assign("month", date.getMonth() + 1);
+            result.start.assign("year", date.getFullYear());
         } else {
-            result.start.imply("day", startMoment.date());
-            result.start.imply("month", startMoment.month() + 1);
-            result.start.imply("year", startMoment.year());
+            result.start.imply("day", date.getDate());
+            result.start.imply("month", date.getMonth() + 1);
+            result.start.imply("year", date.getFullYear());
         }
 
         return result;

package/src/locales/zh/hans/parsers/ZHHansTimeExpressionParser.ts

@@ -1,4 +1,3 @@
-import dayjs from "dayjs";
 import { ParsingContext } from "../../../../chrono";
 import { AbstractParserWithWordBoundaryChecking } from "../../../../common/parsers/AbstractParserWithWordBoundary";
 import { NUMBER, zhStringToNumber } from "../constants";
@@ -74,54 +73,53 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
             return null;
         }
 
-        const refMoment = dayjs(context.refDate);
         const result = context.createParsingResult(match.index, match[0]);
-        let startMoment = refMoment.clone();
+        const startMoment = new Date(context.refDate.getTime());
 
         // ----- Day
         if (match[DAY_GROUP_1]) {
             const day1 = match[DAY_GROUP_1];
             if (day1 == "明") {
                 // Check not "Tomorrow" on late night
-                if (refMoment.hour() > 1) {
-                    startMoment = startMoment.add(1, "day");
+                if (context.refDate.getHours() > 1) {
+                    startMoment.setDate(startMoment.getDate() + 1);
                 }
             } else if (day1 == "昨") {
-                startMoment = startMoment.add(-1, "day");
+                startMoment.setDate(startMoment.getDate() - 1);
             } else if (day1 == "前") {
-                startMoment = startMoment.add(-2, "day");
+                startMoment.setDate(startMoment.getDate() - 2);
             } else if (day1 == "大前") {
-                startMoment = startMoment.add(-3, "day");
+                startMoment.setDate(startMoment.getDate() - 3);
             } else if (day1 == "后") {
-                startMoment = startMoment.add(2, "day");
+                startMoment.setDate(startMoment.getDate() + 2);
             } else if (day1 == "大后") {
-                startMoment = startMoment.add(3, "day");
+                startMoment.setDate(startMoment.getDate() + 3);
             }
-            result.start.assign("day", startMoment.date());
-            result.start.assign("month", startMoment.month() + 1);
-            result.start.assign("year", startMoment.year());
+            result.start.assign("day", startMoment.getDate());
+            result.start.assign("month", startMoment.getMonth() + 1);
+            result.start.assign("year", startMoment.getFullYear());
         } else if (match[DAY_GROUP_3]) {
             const day3 = match[DAY_GROUP_3];
             if (day3 == "明") {
-                startMoment = startMoment.add(1, "day");
+                startMoment.setDate(startMoment.getDate() + 1);
             } else if (day3 == "昨") {
-                startMoment = startMoment.add(-1, "day");
+                startMoment.setDate(startMoment.getDate() - 1);
             } else if (day3 == "前") {
-                startMoment = startMoment.add(-2, "day");
+                startMoment.setDate(startMoment.getDate() - 2);
             } else if (day3 == "大前") {
-                startMoment = startMoment.add(-3, "day");
+                startMoment.setDate(startMoment.getDate() - 3);
             } else if (day3 == "后") {
-                startMoment = startMoment.add(2, "day");
+                startMoment.setDate(startMoment.getDate() + 2);
             } else if (day3 == "大后") {
-                startMoment = startMoment.add(3, "day");
+                startMoment.setDate(startMoment.getDate() + 3);
             }
-            result.start.assign("day", startMoment.date());
-            result.start.assign("month", startMoment.month() + 1);
-            result.start.assign("year", startMoment.year());
+            result.start.assign("day", startMoment.getDate());
+            result.start.assign("month", startMoment.getMonth() + 1);
+            result.start.assign("year", startMoment.getFullYear());
         } else {
-            result.start.imply("day", startMoment.date());
-            result.start.imply("month", startMoment.month() + 1);
-            result.start.imply("year", startMoment.year());
+            result.start.imply("day", startMoment.getDate());
+            result.start.imply("month", startMoment.getMonth() + 1);
+            result.start.imply("year", startMoment.getFullYear());
         }
 
         let hour = 0;
@@ -233,8 +231,8 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
         //                  Extracting the 'to' chunk
         // ==============================================================
 
-        match = SECOND_REG_PATTERN.exec(context.text.substring(result.index + result.text.length));
-        if (!match) {
+        const secondMatch = SECOND_REG_PATTERN.exec(context.text.substring(result.index + result.text.length));
+        if (!secondMatch) {
             // Not accept number only result
             if (result.text.match(/^\d+$/)) {
                 return null;
@@ -242,53 +240,53 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
             return result;
         }
 
-        let endMoment = startMoment.clone();
+        const endMoment = new Date(startMoment.getTime());
         result.end = context.createParsingComponents();
 
         // ----- Day
-        if (match[DAY_GROUP_1]) {
-            const day1 = match[DAY_GROUP_1];
+        if (secondMatch[DAY_GROUP_1]) {
+            const day1 = secondMatch[DAY_GROUP_1];
             if (day1 == "明") {
                 // Check not "Tomorrow" on late night
-                if (refMoment.hour() > 1) {
-                    endMoment = endMoment.add(1, "day");
+                if (context.refDate.getHours() > 1) {
+                    endMoment.setDate(endMoment.getDate() + 1);
                 }
             } else if (day1 == "昨") {
-                endMoment = endMoment.add(-1, "day");
+                endMoment.setDate(endMoment.getDate() - 1);
             } else if (day1 == "前") {
-                endMoment = endMoment.add(-2, "day");
+                endMoment.setDate(endMoment.getDate() - 2);
             } else if (day1 == "大前") {
-                endMoment = endMoment.add(-3, "day");
+                endMoment.setDate(endMoment.getDate() - 3);
             } else if (day1 == "后") {
-                endMoment = endMoment.add(2, "day");
+                endMoment.setDate(endMoment.getDate() + 2);
             } else if (day1 == "大后") {
-                endMoment = endMoment.add(3, "day");
+                endMoment.setDate(endMoment.getDate() + 3);
             }
-            result.end.assign("day", endMoment.date());
-            result.end.assign("month", endMoment.month() + 1);
-            result.end.assign("year", endMoment.year());
-        } else if (match[DAY_GROUP_3]) {
-            const day3 = match[DAY_GROUP_3];
+            result.end.assign("day", endMoment.getDate());
+            result.end.assign("month", endMoment.getMonth() + 1);
+            result.end.assign("year", endMoment.getFullYear());
+        } else if (secondMatch[DAY_GROUP_3]) {
+            const day3 = secondMatch[DAY_GROUP_3];
             if (day3 == "明") {
-                endMoment = endMoment.add(1, "day");
+                endMoment.setDate(endMoment.getDate() + 1);
             } else if (day3 == "昨") {
-                endMoment = endMoment.add(-1, "day");
+                endMoment.setDate(endMoment.getDate() - 1);
             } else if (day3 == "前") {
-                endMoment = endMoment.add(-2, "day");
+                endMoment.setDate(endMoment.getDate() - 2);
             } else if (day3 == "大前") {
-                endMoment = endMoment.add(-3, "day");
+                endMoment.setDate(endMoment.getDate() - 3);
             } else if (day3 == "后") {
-                endMoment = endMoment.add(2, "day");
+                endMoment.setDate(endMoment.getDate() + 2);
             } else if (day3 == "大后") {
-                endMoment = endMoment.add(3, "day");
+                endMoment.setDate(endMoment.getDate() + 3);
             }
-            result.end.assign("day", endMoment.date());
-            result.end.assign("month", endMoment.month() + 1);
-            result.end.assign("year", endMoment.year());
+            result.end.assign("day", endMoment.getDate());
+            result.end.assign("month", endMoment.getMonth() + 1);
+            result.end.assign("year", endMoment.getFullYear());
         } else {
-            result.end.imply("day", endMoment.date());
-            result.end.imply("month", endMoment.month() + 1);
-            result.end.imply("year", endMoment.year());
+            result.end.imply("day", endMoment.getDate());
+            result.end.imply("month", endMoment.getMonth() + 1);
+            result.end.imply("year", endMoment.getFullYear());
         }
 
         hour = 0;
@@ -296,31 +294,31 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
         meridiem = -1;
 
         // ----- Second
-        if (match[SECOND_GROUP]) {
-            let second = parseInt(match[SECOND_GROUP]);
+        if (secondMatch[SECOND_GROUP]) {
+            let second = parseInt(secondMatch[SECOND_GROUP]);
             if (isNaN(second)) {
-                second = zhStringToNumber(match[SECOND_GROUP]);
+                second = zhStringToNumber(secondMatch[SECOND_GROUP]);
             }
 
             if (second >= 60) return null;
             result.end.assign("second", second);
         }
 
-        hour = parseInt(match[HOUR_GROUP]);
+        hour = parseInt(secondMatch[HOUR_GROUP]);
         if (isNaN(hour)) {
-            hour = zhStringToNumber(match[HOUR_GROUP]);
+            hour = zhStringToNumber(secondMatch[HOUR_GROUP]);
         }
 
         // ----- Minutes
-        if (match[MINUTE_GROUP]) {
-            if (match[MINUTE_GROUP] == "半") {
+        if (secondMatch[MINUTE_GROUP]) {
+            if (secondMatch[MINUTE_GROUP] == "半") {
                 minute = 30;
-            } else if (match[MINUTE_GROUP] == "正" || match[MINUTE_GROUP] == "整") {
+            } else if (secondMatch[MINUTE_GROUP] == "正" || secondMatch[MINUTE_GROUP] == "整") {
                 minute = 0;
             } else {
-                minute = parseInt(match[MINUTE_GROUP]);
+                minute = parseInt(secondMatch[MINUTE_GROUP]);
                 if (isNaN(minute)) {
-                    minute = zhStringToNumber(match[MINUTE_GROUP]);
+                    minute = zhStringToNumber(secondMatch[MINUTE_GROUP]);
                 }
             }
         } else if (hour > 100) {
@@ -340,9 +338,9 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
         }
 
         // ----- AM & PM
-        if (match[AM_PM_HOUR_GROUP]) {
+        if (secondMatch[AM_PM_HOUR_GROUP]) {
             if (hour > 12) return null;
-            const ampm = match[AM_PM_HOUR_GROUP][0].toLowerCase();
+            const ampm = secondMatch[AM_PM_HOUR_GROUP][0].toLowerCase();
             if (ampm == "a") {
                 meridiem = 0;
                 if (hour == 12) hour = 0;
@@ -368,8 +366,8 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
                     }
                 }
             }
-        } else if (match[ZH_AM_PM_HOUR_GROUP_1]) {
-            const zhAMPMString1 = match[ZH_AM_PM_HOUR_GROUP_1];
+        } else if (secondMatch[ZH_AM_PM_HOUR_GROUP_1]) {
+            const zhAMPMString1 = secondMatch[ZH_AM_PM_HOUR_GROUP_1];
             const zhAMPM1 = zhAMPMString1[0];
             if (zhAMPM1 == "早") {
                 meridiem = 0;
@@ -378,8 +376,8 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
                 meridiem = 1;
                 if (hour != 12) hour += 12;
             }
-        } else if (match[ZH_AM_PM_HOUR_GROUP_2]) {
-            const zhAMPMString2 = match[ZH_AM_PM_HOUR_GROUP_2];
+        } else if (secondMatch[ZH_AM_PM_HOUR_GROUP_2]) {
+            const zhAMPMString2 = secondMatch[ZH_AM_PM_HOUR_GROUP_2];
             const zhAMPM2 = zhAMPMString2[0];
             if (zhAMPM2 == "上" || zhAMPM2 == "早" || zhAMPM2 == "凌") {
                 meridiem = 0;
@@ -388,8 +386,8 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
                 meridiem = 1;
                 if (hour != 12) hour += 12;
             }
-        } else if (match[ZH_AM_PM_HOUR_GROUP_3]) {
-            const zhAMPMString3 = match[ZH_AM_PM_HOUR_GROUP_3];
+        } else if (secondMatch[ZH_AM_PM_HOUR_GROUP_3]) {
+            const zhAMPMString3 = secondMatch[ZH_AM_PM_HOUR_GROUP_3];
             const zhAMPM3 = zhAMPMString3[0];
             if (zhAMPM3 == "上" || zhAMPM3 == "早" || zhAMPM3 == "凌") {
                 meridiem = 0;
@@ -400,7 +398,7 @@ export default class ZHHansTimeExpressionParser extends AbstractParserWithWordBo
             }
         }
 
-        result.text = result.text + match[0];
+        result.text = result.text + secondMatch[0];
         result.end.assign("hour", hour);
         result.end.assign("minute", minute);
         if (meridiem >= 0) {

package/src/locales/zh/hans/parsers/ZHHansWeekdayParser.ts

@@ -1,4 +1,3 @@
-import dayjs from "dayjs";
 import { ParsingContext } from "../../../../chrono";
 import { AbstractParserWithWordBoundaryChecking } from "../../../../common/parsers/AbstractParserWithWordBoundary";
 import { ParsingResult } from "../../../../results";
@@ -18,27 +17,29 @@ export default class ZHHansWeekdayParser extends AbstractParserWithWordBoundaryC
         const offset = WEEKDAY_OFFSET[dayOfWeek];
         if (offset === undefined) return null;
 
-        let startMoment = dayjs(context.refDate);
+        const date = new Date(context.refDate.getTime());
         const startMomentFixed = false;
-        const refOffset = startMoment.day();
+        const refOffset = date.getDay();
 
-        if (Math.abs(offset - 7 - refOffset) < Math.abs(offset - refOffset)) {
-            startMoment = startMoment.day(offset - 7);
-        } else if (Math.abs(offset + 7 - refOffset) < Math.abs(offset - refOffset)) {
-            startMoment = startMoment.day(offset + 7);
-        } else {
-            startMoment = startMoment.day(offset);
+        let diff = offset - refOffset;
+        if (Math.abs(diff - 7) < Math.abs(diff)) {
+            diff -= 7;
+        }
+        if (Math.abs(diff + 7) < Math.abs(diff)) {
+            diff += 7;
         }
 
+        date.setDate(date.getDate() + diff);
+
         result.start.assign("weekday", offset);
         if (startMomentFixed) {
-            result.start.assign("day", startMoment.date());
-            result.start.assign("month", startMoment.month() + 1);
-            result.start.assign("year", startMoment.year());
+            result.start.assign("day", date.getDate());
+            result.start.assign("month", date.getMonth() + 1);
+            result.start.assign("year", date.getFullYear());
         } else {
-            result.start.imply("day", startMoment.date());
-            result.start.imply("month", startMoment.month() + 1);
-            result.start.imply("year", startMoment.year());
+            result.start.imply("day", date.getDate());
+            result.start.imply("month", date.getMonth() + 1);
+            result.start.imply("year", date.getFullYear());
         }
 
         return result;