npm - chrono-node - Versions diffs - 2.3.9 → 2.4.2 - Mend

chrono-node 2.3.9 → 2.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (406) hide show

package/docs/modules/pt.html ADDED Viewed

@@ -0,0 +1,248 @@
+<!doctype html>
+<html class="default no-js">
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<title>pt | Chrono - v2.2.7</title>
+	<meta name="description" content="Documentation for Chrono - v2.2.7">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
+</head>
+<body>
+<header>
+	<div class="tsd-page-toolbar">
+		<div class="container">
+			<div class="table-wrap">
+				<div class="table-cell" id="tsd-search" data-index="../assets/js/search.json" data-base="..">
+					<div class="field">
+						<label for="tsd-search-field" class="tsd-widget search no-caption">Search</label>
+						<input id="tsd-search-field" type="text" />
+					</div>
+					<ul class="results">
+						<li class="state loading">Preparing search index...</li>
+						<li class="state failure">The search index is not available</li>
+					</ul>
+					<a href="../index.html" class="title">Chrono - v2.2.7</a>
+				</div>
+				<div class="table-cell" id="tsd-widgets">
+					<div id="tsd-filter">
+						<a href="#" class="tsd-widget options no-caption" data-toggle="options">Options</a>
+						<div class="tsd-filter-group">
+							<div class="tsd-select" id="tsd-filter-visibility">
+								<span class="tsd-select-label">All</span>
+								<ul class="tsd-select-list">
+									<li data-value="public">Public</li>
+									<li data-value="protected">Public/Protected</li>
+									<li data-value="private" class="selected">All</li>
+								</ul>
+							</div>
+							<input type="checkbox" id="tsd-filter-inherited" checked />
+							<label class="tsd-widget" for="tsd-filter-inherited">Inherited</label>
+							<input type="checkbox" id="tsd-filter-externals" checked />
+							<label class="tsd-widget" for="tsd-filter-externals">Externals</label>
+						</div>
+					</div>
+					<a href="#" class="tsd-widget menu no-caption" data-toggle="menu">Menu</a>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="tsd-page-title">
+		<div class="container">
+			<ul class="tsd-breadcrumb">
+				<li>
+					<a href="../index.html">Chrono - v2.2.7</a>
+				</li>
+				<li>
+					<a href="pt.html">pt</a>
+				</li>
+			</ul>
+			<h1>Namespace pt</h1>
+		</div>
+	</div>
+</header>
+<div class="container container-main">
+	<div class="row">
+		<div class="col-8 col-content">
+			<section class="tsd-panel tsd-comment">
+				<div class="tsd-comment tsd-typography">
+					<div class="lead">
+						<p>Chrono components for Portuguese support (<em>parsers</em>, <em>refiners</em>, and <em>configuration</em>)</p>
+					</div>
+				</div>
+			</section>
+			<section class="tsd-panel-group tsd-index-group">
+				<h2>Index</h2>
+				<section class="tsd-panel tsd-index-panel">
+					<div class="tsd-index-content">
+						<section class="tsd-index-section ">
+							<h3>Variables</h3>
+							<ul class="tsd-index-list">
+								<li class="tsd-kind-variable tsd-parent-kind-namespace"><a href="pt.html#casual" class="tsd-kind-icon">casual</a></li>
+								<li class="tsd-kind-variable tsd-parent-kind-namespace"><a href="pt.html#strict" class="tsd-kind-icon">strict</a></li>
+							</ul>
+						</section>
+						<section class="tsd-index-section ">
+							<h3>Functions</h3>
+							<ul class="tsd-index-list">
+								<li class="tsd-kind-function tsd-parent-kind-namespace"><a href="pt.html#parse" class="tsd-kind-icon">parse</a></li>
+								<li class="tsd-kind-function tsd-parent-kind-namespace"><a href="pt.html#parsedate" class="tsd-kind-icon">parse<wbr>Date</a></li>
+							</ul>
+						</section>
+					</div>
+				</section>
+			</section>
+			<section class="tsd-panel-group tsd-member-group ">
+				<h2>Variables</h2>
+				<section class="tsd-panel tsd-member tsd-kind-variable tsd-parent-kind-namespace">
+					<a name="casual" class="tsd-anchor"></a>
+					<h3><span class="tsd-flag ts-flagConst">Const</span> casual</h3>
+					<div class="tsd-signature tsd-kind-icon">casual<span class="tsd-signature-symbol">:</span> <a href="../classes/chrono.html" class="tsd-signature-type" data-tsd-kind="Class">Chrono</a><span class="tsd-signature-symbol"> = ...</span></div>
+					<aside class="tsd-sources">
+						<ul>
+							<li>Defined in <a href="https://github.com/wanasit/chrono/blob/59d06db/src/locales/pt/index.ts#L20">locales/pt/index.ts:20</a></li>
+						</ul>
+					</aside>
+				</section>
+				<section class="tsd-panel tsd-member tsd-kind-variable tsd-parent-kind-namespace">
+					<a name="strict" class="tsd-anchor"></a>
+					<h3><span class="tsd-flag ts-flagConst">Const</span> strict</h3>
+					<div class="tsd-signature tsd-kind-icon">strict<span class="tsd-signature-symbol">:</span> <a href="../classes/chrono.html" class="tsd-signature-type" data-tsd-kind="Class">Chrono</a><span class="tsd-signature-symbol"> = ...</span></div>
+					<aside class="tsd-sources">
+						<ul>
+							<li>Defined in <a href="https://github.com/wanasit/chrono/blob/59d06db/src/locales/pt/index.ts#L21">locales/pt/index.ts:21</a></li>
+						</ul>
+					</aside>
+				</section>
+			</section>
+			<section class="tsd-panel-group tsd-member-group ">
+				<h2>Functions</h2>
+				<section class="tsd-panel tsd-member tsd-kind-function tsd-parent-kind-namespace">
+					<a name="parse" class="tsd-anchor"></a>
+					<h3>parse</h3>
+					<ul class="tsd-signatures tsd-kind-function tsd-parent-kind-namespace">
+						<li class="tsd-signature tsd-kind-icon">parse<span class="tsd-signature-symbol">(</span>text<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span>, ref<span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">Date</span>, option<span class="tsd-signature-symbol">?: </span><a href="../interfaces/parsingoption.html" class="tsd-signature-type" data-tsd-kind="Interface">ParsingOption</a><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><a href="../interfaces/parsedresult.html" class="tsd-signature-type" data-tsd-kind="Interface">ParsedResult</a><span class="tsd-signature-symbol">[]</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+								<ul>
+									<li>Defined in <a href="https://github.com/wanasit/chrono/blob/59d06db/src/locales/pt/index.ts#L23">locales/pt/index.ts:23</a></li>
+								</ul>
+							</aside>
+							<h4 class="tsd-parameters-title">Parameters</h4>
+							<ul class="tsd-parameters">
+								<li>
+									<h5>text: <span class="tsd-signature-type">string</span></h5>
+								</li>
+								<li>
+									<h5><span class="tsd-flag ts-flagOptional">Optional</span> ref: <span class="tsd-signature-type">Date</span></h5>
+								</li>
+								<li>
+									<h5><span class="tsd-flag ts-flagOptional">Optional</span> option: <a href="../interfaces/parsingoption.html" class="tsd-signature-type" data-tsd-kind="Interface">ParsingOption</a></h5>
+								</li>
+							</ul>
+							<h4 class="tsd-returns-title">Returns <a href="../interfaces/parsedresult.html" class="tsd-signature-type" data-tsd-kind="Interface">ParsedResult</a><span class="tsd-signature-symbol">[]</span></h4>
+						</li>
+					</ul>
+				</section>
+				<section class="tsd-panel tsd-member tsd-kind-function tsd-parent-kind-namespace">
+					<a name="parsedate" class="tsd-anchor"></a>
+					<h3>parse<wbr>Date</h3>
+					<ul class="tsd-signatures tsd-kind-function tsd-parent-kind-namespace">
+						<li class="tsd-signature tsd-kind-icon">parse<wbr>Date<span class="tsd-signature-symbol">(</span>text<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span>, ref<span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">Date</span>, option<span class="tsd-signature-symbol">?: </span><a href="../interfaces/parsingoption.html" class="tsd-signature-type" data-tsd-kind="Interface">ParsingOption</a><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Date</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+								<ul>
+									<li>Defined in <a href="https://github.com/wanasit/chrono/blob/59d06db/src/locales/pt/index.ts#L27">locales/pt/index.ts:27</a></li>
+								</ul>
+							</aside>
+							<h4 class="tsd-parameters-title">Parameters</h4>
+							<ul class="tsd-parameters">
+								<li>
+									<h5>text: <span class="tsd-signature-type">string</span></h5>
+								</li>
+								<li>
+									<h5><span class="tsd-flag ts-flagOptional">Optional</span> ref: <span class="tsd-signature-type">Date</span></h5>
+								</li>
+								<li>
+									<h5><span class="tsd-flag ts-flagOptional">Optional</span> option: <a href="../interfaces/parsingoption.html" class="tsd-signature-type" data-tsd-kind="Interface">ParsingOption</a></h5>
+								</li>
+							</ul>
+							<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Date</span></h4>
+						</li>
+					</ul>
+				</section>
+			</section>
+		</div>
+		<div class="col-4 col-menu menu-sticky-wrap menu-highlight">
+			<nav class="tsd-navigation primary">
+				<ul>
+					<li class=" ">
+						<a href="../index.html">Exports</a>
+					</li>
+					<li class=" tsd-kind-namespace">
+						<a href="de.html">de</a>
+					</li>
+					<li class=" tsd-kind-namespace">
+						<a href="en.html">en</a>
+					</li>
+					<li class=" tsd-kind-namespace">
+						<a href="fr.html">fr</a>
+					</li>
+					<li class=" tsd-kind-namespace">
+						<a href="ja.html">ja</a>
+					</li>
+					<li class=" tsd-kind-namespace">
+						<a href="nl.html">nl</a>
+					</li>
+					<li class="current tsd-kind-namespace">
+						<a href="pt.html">pt</a>
+					</li>
+				</ul>
+			</nav>
+			<nav class="tsd-navigation secondary menu-sticky">
+				<ul class="before-current">
+					<li class=" tsd-kind-variable tsd-parent-kind-namespace">
+						<a href="pt.html#casual" class="tsd-kind-icon">casual</a>
+					</li>
+					<li class=" tsd-kind-variable tsd-parent-kind-namespace">
+						<a href="pt.html#strict" class="tsd-kind-icon">strict</a>
+					</li>
+					<li class=" tsd-kind-function tsd-parent-kind-namespace">
+						<a href="pt.html#parse" class="tsd-kind-icon">parse</a>
+					</li>
+					<li class=" tsd-kind-function tsd-parent-kind-namespace">
+						<a href="pt.html#parsedate" class="tsd-kind-icon">parse<wbr>Date</a>
+					</li>
+				</ul>
+			</nav>
+		</div>
+	</div>
+</div>
+<footer class="with-border-bottom">
+	<div class="container">
+		<h2>Legend</h2>
+		<div class="tsd-legend-group">
+			<ul class="tsd-legend">
+				<li class="tsd-kind-constructor tsd-parent-kind-class"><span class="tsd-kind-icon">Constructor</span></li>
+				<li class="tsd-kind-property tsd-parent-kind-class"><span class="tsd-kind-icon">Property</span></li>
+				<li class="tsd-kind-method tsd-parent-kind-class"><span class="tsd-kind-icon">Method</span></li>
+			</ul>
+			<ul class="tsd-legend">
+				<li class="tsd-kind-property tsd-parent-kind-interface"><span class="tsd-kind-icon">Property</span></li>
+				<li class="tsd-kind-method tsd-parent-kind-interface"><span class="tsd-kind-icon">Method</span></li>
+			</ul>
+		</div>
+	</div>
+</footer>
+<div class="container tsd-generator">
+	<p>Generated using <a href="https://typedoc.org/" target="_blank">TypeDoc</a></p>
+</div>
+<div class="overlay"></div>
+<script src="../assets/js/main.js"></script>
+</body>
+</html>

package/package.json CHANGED Viewed

@@ -15,7 +15,7 @@
     "preset": "ts-jest"
   },
   "license": "MIT",
-  "version": "2.3.9",
+  "version": "2.4.2",
   "directories": {
     "source": "./src",
     "test": "./test"

package/src/chrono.ts CHANGED Viewed

@@ -140,7 +140,9 @@ export class ParsingContext implements DebugHandler {
     readonly option: ParsingOption;
     readonly reference: ReferenceWithTimezone;
-    // Deprecated. Use reference.instant instead.
+    /**
+     * @deprecated. Use reference.instant instead.
+     */
     readonly refDate: Date;
     constructor(text: string, refDate?: ParsingReference | Date, option?: ParsingOption) {

package/src/common/calculation/weekdays.ts ADDED Viewed

@@ -0,0 +1,89 @@
+import { Weekday } from "../../index";
+import { ParsingComponents, ReferenceWithTimezone } from "../../results";
+import { addImpliedTimeUnits } from "../../utils/timeunits";
+/**
+ * Returns the parsing components at the weekday (considering the modifier). The time and timezone is assume to be
+ * similar to the reference.
+ * @param reference
+ * @param weekday
+ * @param modifier "this", "next", "last" modifier word. If empty, returns the weekday closest to the `refDate`.
+ */
+export function createParsingComponentsAtWeekday(
+    reference: ReferenceWithTimezone,
+    weekday: Weekday,
+    modifier?: "this" | "next" | "last"
+): ParsingComponents {
+    const refDate = reference.getDateWithAdjustedTimezone();
+    const daysToWeekday = getDaysToWeekday(refDate, weekday, modifier);
+    let components = new ParsingComponents(reference);
+    components = addImpliedTimeUnits(components, { "day": daysToWeekday });
+    components.assign("weekday", weekday);
+    return components;
+}
+/**
+ * Returns number of days from refDate to the weekday. The refDate date and timezone information is used.
+ * @param refDate
+ * @param weekday
+ * @param modifier "this", "next", "last" modifier word. If empty, returns the weekday closest to the `refDate`.
+ */
+export function getDaysToWeekday(refDate: Date, weekday: Weekday, modifier?: "this" | "next" | "last"): number {
+    const refWeekday = refDate.getDay() as Weekday;
+    switch (modifier) {
+        case "this":
+            return getDaysForwardToWeekday(refDate, weekday);
+        case "last":
+            return getBackwardDaysToWeekday(refDate, weekday);
+        case "next":
+            // From Sunday, the next Sunday is 7 days later.
+            // Otherwise, next Mon is 1 days later, next Tues is 2 days later, and so on..., (return enum value)
+            if (refWeekday == Weekday.SUNDAY) {
+                return weekday == Weekday.SUNDAY ? 7 : weekday;
+            }
+            // From Saturday, the next Saturday is 7 days later, the next Sunday is 8-days later.
+            // Otherwise, next Mon is (1 + 1) days later, next Tues is (1 + 2) days later, and so on...,
+            // (return, 2 + [enum value] days)
+            if (refWeekday == Weekday.SATURDAY) {
+                if (weekday == Weekday.SATURDAY) return 7;
+                if (weekday == Weekday.SUNDAY) return 8;
+                return 1 + weekday;
+            }
+            // From weekdays, next Mon is the following week's Mon, next Tues the following week's Tues, and so on...
+            // If the week's weekday already passed (weekday < refWeekday), we simply count forward to next week
+            // (similar to 'this'). Otherwise, count forward to this week, then add another 7 days.
+            if (weekday < refWeekday && weekday != Weekday.SUNDAY) {
+                return getDaysForwardToWeekday(refDate, weekday);
+            } else {
+                return getDaysForwardToWeekday(refDate, weekday) + 7;
+            }
+    }
+    return getDaysToWeekdayClosest(refDate, weekday);
+}
+export function getDaysToWeekdayClosest(refDate: Date, weekday: Weekday): number {
+    const backward = getBackwardDaysToWeekday(refDate, weekday);
+    const forward = getDaysForwardToWeekday(refDate, weekday);
+    return forward < -backward ? forward : backward;
+}
+export function getDaysForwardToWeekday(refDate: Date, weekday: Weekday): number {
+    const refWeekday = refDate.getDay();
+    let forwardCount = weekday - refWeekday;
+    if (forwardCount < 0) {
+        forwardCount += 7;
+    }
+    return forwardCount;
+}
+export function getBackwardDaysToWeekday(refDate: Date, weekday: Weekday): number {
+    const refWeekday = refDate.getDay();
+    let backwardCount = weekday - refWeekday;
+    if (backwardCount >= 0) {
+        backwardCount -= 7;
+    }
+    return backwardCount;
+}

package/src/common/parsers/SlashDateFormatParser.ts CHANGED Viewed

@@ -39,12 +39,13 @@ export default class SlashDateFormatParser implements Parser {
     }
     extract(context: ParsingContext, match: RegExpMatchArray): ParsingResult {
-        if (match[OPENING_GROUP] == "/" || match[ENDING_GROUP] == "/") {
-            // Long skip, if there is some overlapping like:
-            // XX[/YY/ZZ]
-            // [XX/YY/]ZZ
-            match.index += match[0].length;
-            return;
+        // Because of how pattern is executed on remaining text in `chrono.ts`, the character before the match could
+        // still be a number (e.g. X[X/YY/ZZ] or XX[/YY/ZZ] or [XX/YY/]ZZ). We want to check and skip them.
+        if (match[OPENING_GROUP].length == 0 && match.index > 0 && match.index < context.text.length) {
+            const previousChar = context.text[match.index - 1];
+            if (previousChar >= "0" && previousChar <= "9") {
+                return;
+            }
         }
         const index = match.index + match[OPENING_GROUP].length;

package/src/common/refiners/AbstractMergeDateTimeRefiner.ts CHANGED Viewed

@@ -6,7 +6,7 @@ import { MergingRefiner } from "../abstractRefiners";
 import { ParsingResult } from "../../results";
 import { mergeDateTimeResult } from "../../calculation/mergingCalculation";
-export default abstract class ENMergeDateTimeRefiner extends MergingRefiner {
+export default abstract class AbstractMergeDateTimeRefiner extends MergingRefiner {
     abstract patternBetween(): RegExp;
     shouldMergeResults(textBetween: string, currentResult: ParsingResult, nextResult: ParsingResult): boolean {

package/src/common/refiners/ForwardDateRefiner.ts CHANGED Viewed

@@ -7,6 +7,7 @@
 import { ParsingContext, Refiner } from "../../chrono";
 import { ParsingResult } from "../../results";
 import dayjs from "dayjs";
+import { implySimilarDate } from "../../utils/dayjs";
 export default class ForwardDateRefiner implements Refiner {
     refine(context: ParsingContext, results: ParsingResult[]): ParsingResult[] {
@@ -17,6 +18,18 @@ export default class ForwardDateRefiner implements Refiner {
         results.forEach(function (result) {
             let refMoment = dayjs(context.refDate);
+            if (result.start.isOnlyTime() && refMoment.isAfter(result.start.dayjs())) {
+                refMoment = refMoment.add(1, "day");
+                implySimilarDate(result.start, refMoment);
+                if (result.end && result.end.isOnlyTime()) {
+                    implySimilarDate(result.end, refMoment);
+                    if (result.start.dayjs().isAfter(result.end.dayjs())) {
+                        refMoment = refMoment.add(1, "day");
+                        implySimilarDate(result.end, refMoment);
+                    }
+                }
+            }
             if (result.start.isOnlyDayMonthComponent() && refMoment.isAfter(result.start.dayjs())) {
                 for (let i = 0; i < 3 && refMoment.isAfter(result.start.dayjs()); i++) {
                     result.start.imply("year", result.start.get("year") + 1);

package/src/index.ts CHANGED Viewed

@@ -99,6 +99,16 @@ export enum Meridiem {
     PM = 1,
 }
+export enum Weekday {
+    SUNDAY = 0,
+    MONDAY = 1,
+    TUESDAY = 2,
+    WEDNESDAY = 3,
+    THURSDAY = 4,
+    FRIDAY = 5,
+    SATURDAY = 6,
+}
 // Export all locales
 import * as de from "./locales/de";
 import * as fr from "./locales/fr";

package/src/locales/de/parsers/DEWeekdayParser.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../constants";
 import { matchAnyPattern } from "../../../utils/pattern";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { toDayJSWeekday } from "../../../calculation/weeks";
+import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
 const PATTERN = new RegExp(
     "(?:(?:\\,|\\(|\\（)\\s*)?" +
@@ -44,12 +44,6 @@ export default class DEWeekdayParser extends AbstractParserWithWordBoundaryCheck
             modifier = "this";
         }
-        const date = toDayJSWeekday(context.refDate, offset, modifier);
-        return context
-            .createParsingComponents()
-            .assign("weekday", offset)
-            .imply("day", date.date())
-            .imply("month", date.month() + 1)
-            .imply("year", date.year());
+        return createParsingComponentsAtWeekday(context.reference, offset, modifier);
     }
 }

package/src/locales/en/constants.ts CHANGED Viewed

@@ -2,8 +2,9 @@ import { OpUnitType, QUnitType } from "dayjs";
 import { matchAnyPattern, repeatedTimeunitPattern } from "../../utils/pattern";
 import { findMostLikelyADYear } from "../../calculation/years";
 import { TimeUnits } from "../../utils/timeunits";
+import { Weekday } from "../../index";
-export const WEEKDAY_DICTIONARY: { [word: string]: number } = {
+export const WEEKDAY_DICTIONARY: { [word: string]: Weekday } = {
     sunday: 0,
     sun: 0,
     "sun.": 0,

package/src/locales/en/parsers/ENCasualTimeParser.ts CHANGED Viewed

@@ -2,7 +2,8 @@ import { ParsingContext } from "../../../chrono";
 import { Meridiem } from "../../../index";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
 import dayjs from "dayjs";
-import { assignTheNextDay } from "../../../utils/dayjs";
+import { implyTheNextDay } from "../../../utils/dayjs";
+import { midnight } from "../../../common/casualReferences";
 const PATTERN = /(?:this)?\s{0,3}(morning|afternoon|evening|night|midnight|noon)(?=\W|$)/i;
@@ -28,10 +29,10 @@ export default class ENCasualTimeParser extends AbstractParserWithWordBoundaryCh
                 break;
             case "midnight":
-                assignTheNextDay(component, targetDate);
-                component.imply("hour", 0);
-                component.imply("minute", 0);
-                component.imply("second", 0);
+                implyTheNextDay(component, targetDate);
+                component.assign("hour", 0);
+                component.assign("minute", 0);
+                component.assign("second", 0);
                 break;
             case "morning":

package/src/locales/en/parsers/ENWeekdayParser.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../constants";
 import { matchAnyPattern } from "../../../utils/pattern";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { toDayJSWeekday } from "../../../calculation/weeks";
+import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
 const PATTERN = new RegExp(
     "(?:(?:\\,|\\(|\\（)\\s*)?" +
@@ -27,7 +27,7 @@ export default class ENWeekdayParser extends AbstractParserWithWordBoundaryCheck
     innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents {
         const dayOfWeek = match[WEEKDAY_GROUP].toLowerCase();
-        const offset = WEEKDAY_DICTIONARY[dayOfWeek];
+        const weekday = WEEKDAY_DICTIONARY[dayOfWeek];
         const prefix = match[PREFIX_GROUP];
         const postfix = match[POSTFIX_GROUP];
         let modifierWord = prefix || postfix;
@@ -43,12 +43,6 @@ export default class ENWeekdayParser extends AbstractParserWithWordBoundaryCheck
             modifier = "this";
         }
-        const date = toDayJSWeekday(context.refDate, offset, modifier);
-        return context
-            .createParsingComponents()
-            .assign("weekday", offset)
-            .imply("day", date.date())
-            .imply("month", date.month() + 1)
-            .imply("year", date.year());
+        return createParsingComponentsAtWeekday(context.reference, weekday, modifier);
     }
 }

package/src/locales/fr/parsers/FRWeekdayParser.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../constants";
 import { matchAnyPattern } from "../../../utils/pattern";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { toDayJSWeekday } from "../../../calculation/weeks";
+import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
 const PATTERN = new RegExp(
     "(?:(?:\\,|\\(|\\（)\\s*)?" +
@@ -25,8 +25,8 @@ export default class FRWeekdayParser extends AbstractParserWithWordBoundaryCheck
     innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents {
         const dayOfWeek = match[WEEKDAY_GROUP].toLowerCase();
-        const offset = WEEKDAY_DICTIONARY[dayOfWeek];
-        if (offset === undefined) {
+        const weekday = WEEKDAY_DICTIONARY[dayOfWeek];
+        if (weekday === undefined) {
             return null;
         }
@@ -41,12 +41,6 @@ export default class FRWeekdayParser extends AbstractParserWithWordBoundaryCheck
             modifier = "next";
         }
-        const date = toDayJSWeekday(context.refDate, offset, modifier);
-        return context
-            .createParsingComponents()
-            .assign("weekday", offset)
-            .imply("day", date.date())
-            .imply("month", date.month() + 1)
-            .imply("year", date.year());
+        return createParsingComponentsAtWeekday(context.reference, weekday, modifier);
     }
 }

package/src/locales/nl/parsers/NLWeekdayParser.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../../nl/constants";
 import { matchAnyPattern } from "../../../utils/pattern";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { toDayJSWeekday } from "../../../calculation/weeks";
+import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
 const PATTERN = new RegExp(
     "(?:(?:\\,|\\(|\\（)\\s*)?" +
@@ -25,7 +25,7 @@ export default class NLWeekdayParser extends AbstractParserWithWordBoundaryCheck
     innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents {
         const dayOfWeek = match[WEEKDAY_GROUP].toLowerCase();
-        const offset = WEEKDAY_DICTIONARY[dayOfWeek];
+        const weekday = WEEKDAY_DICTIONARY[dayOfWeek];
         const prefix = match[PREFIX_GROUP];
         const postfix = match[POSTFIX_GROUP];
         let modifierWord = prefix || postfix;
@@ -41,12 +41,6 @@ export default class NLWeekdayParser extends AbstractParserWithWordBoundaryCheck
             modifier = "this";
         }
-        const date = toDayJSWeekday(context.refDate, offset, modifier);
-        return context
-            .createParsingComponents()
-            .assign("weekday", offset)
-            .imply("day", date.date())
-            .imply("month", date.month() + 1)
-            .imply("year", date.year());
+        return createParsingComponentsAtWeekday(context.reference, weekday, modifier);
     }
 }

package/src/locales/pt/parsers/PTWeekdayParser.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { ParsingComponents } from "../../../results";
 import { WEEKDAY_DICTIONARY } from "../constants";
 import { matchAnyPattern } from "../../../utils/pattern";
 import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
-import { toDayJSWeekday } from "../../../calculation/weeks";
+import { createParsingComponentsAtWeekday } from "../../../common/calculation/weekdays";
 const PATTERN = new RegExp(
     "(?:(?:\\,|\\(|\\（)\\s*)?" +
@@ -26,8 +26,8 @@ export default class PTWeekdayParser extends AbstractParserWithWordBoundaryCheck
     innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents {
         const dayOfWeek = match[WEEKDAY_GROUP].toLowerCase();
-        const offset = WEEKDAY_DICTIONARY[dayOfWeek];
-        if (offset === undefined) {
+        const weekday = WEEKDAY_DICTIONARY[dayOfWeek];
+        if (weekday === undefined) {
             return null;
         }
@@ -45,12 +45,6 @@ export default class PTWeekdayParser extends AbstractParserWithWordBoundaryCheck
             modifier = "this";
         }
-        const date = toDayJSWeekday(context.refDate, offset, modifier);
-        return context
-            .createParsingComponents()
-            .assign("weekday", offset)
-            .imply("day", date.date())
-            .imply("month", date.month() + 1)
-            .imply("year", date.year());
+        return createParsingComponentsAtWeekday(context.reference, weekday, modifier);
     }
 }