Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add exact digits patterns (#916) #3729

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/parse/_lib/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,26 @@ export const numericPatterns = {
threeDigits: /^\d{1,3}/, // 0 to 999
fourDigits: /^\d{1,4}/, // 0 to 9999

exactTwoDigits: /^\d{2}/, // 00 to 99
exactThreeDigits: /^\d{3}/, // 00 to 99
exactFourDigits: /^\d{4}/, // 00 to 99

minSingleDigits: /^(?!0\d)\d+/, // more than 0
minTwoDigits: /(^(?!0\d)\d{3,})|(\d{2})/, // more than 00
minThreeDigits: /(^(?!0\d)\d{4,})|(\d{3})/, // more than 000
minFourDigits: /(^(?!0\d)\d{5,})|(\d{4})/, // more than 0000

anyDigitsSigned: /^-?\d+/,
singleDigitSigned: /^-?\d/, // 0 to 9, -0 to -9
twoDigitsSigned: /^-?\d{1,2}/, // 0 to 99, -0 to -99
threeDigitsSigned: /^-?\d{1,3}/, // 0 to 999, -0 to -999
fourDigitsSigned: /^-?\d{1,4}/, // 0 to 9999, -0 to -9999

exactTwoDigitsSigned: /^-?\d{2}/, // 0 to 99, -0 to -99
exactThreeDigitsSigned: /^-?\d{3}/, // 0 to 999, -0 to -999
exactFourDigitsSigned: /^-?\d{4}/, // 0 to 9999, -0 to -9999

minSingleDigitSigned: /^-?(?!0\d)\d+/, // more than 0, less than -0, not starting with 0
};

export const timezonePatterns = {
Expand Down
24 changes: 18 additions & 6 deletions src/parse/_lib/parsers/DateParser.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import type { Match } from "../../../locale/types.js";
import { numericPatterns } from "../constants.js";
import { Parser } from "../Parser.js";
import type { ParseFlags, ParseResult } from "../types.js";
import type { ParseFlags, ParseResult, ParserOptions } from "../types.js";
import {
isLeapYearIndex,
parseNDigits,
parseMinNDigits,
parseNumericPattern,
} from "../utils.js";

Expand All @@ -18,14 +19,25 @@ export class DateParser extends Parser<number> {
priority = 90;
subPriority = 1;

parse(dateString: string, token: string, match: Match): ParseResult<number> {
parse(
dateString: string,
token: string,
match: Match,
options: ParserOptions,
): ParseResult<number> {
switch (token) {
case "d":
return parseNumericPattern(numericPatterns.date, dateString);
case "d": {
const pattern = options.strict
? numericPatterns.minSingleDigits
: numericPatterns.date;
return parseNumericPattern(pattern, dateString);
}
case "do":
return match.ordinalNumber(dateString, { unit: "date" });
default:
return parseNDigits(token.length, dateString);
default: {
const parseFn = options.strict ? parseMinNDigits : parseNDigits;
return parseFn(token.length, dateString);
}
}
}

Expand Down
20 changes: 15 additions & 5 deletions src/parse/_lib/parsers/DayOfYearParser.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,37 @@
import type { Match } from "../../../locale/types.js";
import { numericPatterns } from "../constants.js";
import { Parser } from "../Parser.js";
import type { ParseFlags, ParseResult } from "../types.js";
import type { ParseFlags, ParseResult, ParserOptions } from "../types.js";
import {
isLeapYearIndex,
parseNDigits,
parseNumericPattern,
parseMinNDigits,
} from "../utils.js";

export class DayOfYearParser extends Parser<number> {
priority = 90;

subpriority = 1;

parse(dateString: string, token: string, match: Match): ParseResult<number> {
parse(
dateString: string,
token: string,
match: Match,
options: ParserOptions,
): ParseResult<number> {
switch (token) {
case "D":
case "DD":
return parseNumericPattern(numericPatterns.dayOfYear, dateString);
return options.strict
? parseMinNDigits(token.length, dateString)
: parseNumericPattern(numericPatterns.dayOfYear, dateString);
case "Do":
return match.ordinalNumber(dateString, { unit: "date" });
default:
return parseNDigits(token.length, dateString);
default: {
const parseFn = options.strict ? parseMinNDigits : parseNDigits;
return parseFn(token.length, dateString);
}
}
}

Expand Down
36 changes: 29 additions & 7 deletions src/parse/_lib/parsers/ExtendedYearParser.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,38 @@
import type { Match } from "../../../locale/types.js";
import { Parser } from "../Parser.js";
import type { ParseFlags, ParseResult } from "../types.js";
import { parseNDigitsSigned } from "../utils.js";
import { numericPatterns } from "../constants.js";
import type { ParseFlags, ParseResult, ParserOptions } from "../types.js";
import {
parseNDigitsSigned,
parseExactNDigitsSigned,
parseNumericPattern,
} from "../utils.js";

export class ExtendedYearParser extends Parser<number> {
priority = 130;

parse(dateString: string, token: string): ParseResult<number> {
if (token === "u") {
return parseNDigitsSigned(4, dateString);
}
parse(
dateString: string,
token: string,
_: Match,
options: ParserOptions,
): ParseResult<number> {
if (options.strict) {
if (token === "u") {
return parseNumericPattern(
numericPatterns.minSingleDigitSigned,
dateString,
);
}

return parseExactNDigitsSigned(token.length, dateString);
} else {
if (token === "u") {
return parseNDigitsSigned(4, dateString);
}

return parseNDigitsSigned(token.length, dateString);
return parseNDigitsSigned(token.length, dateString);
}
}

set<DateType extends Date>(
Expand Down
15 changes: 11 additions & 4 deletions src/parse/_lib/parsers/FractionOfSecondParser.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
import type { Match } from "../../../locale/types.js";
import { Parser } from "../Parser.js";
import type { ParseFlags, ParseResult } from "../types.js";
import { mapValue, parseNDigits } from "../utils.js";
import type { ParseFlags, ParseResult, ParserOptions } from "../types.js";
import { mapValue, parseNDigits, parseExactNDigits } from "../utils.js";

export class FractionOfSecondParser extends Parser<number> {
priority = 30;

parse(dateString: string, token: string): ParseResult<number> {
parse(
dateString: string,
token: string,
_: Match,
options: ParserOptions,
): ParseResult<number> {
const valueCallback = (value: number) =>
Math.trunc(value * Math.pow(10, -token.length + 3));
return mapValue(parseNDigits(token.length, dateString), valueCallback);
const parseFn = options.strict ? parseExactNDigits : parseNDigits;
return mapValue(parseFn(token.length, dateString), valueCallback);
}

set<DateType extends Date>(
Expand Down
29 changes: 22 additions & 7 deletions src/parse/_lib/parsers/Hour0To11Parser.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
import type { Match } from "../../../locale/types.js";
import { numericPatterns } from "../constants.js";
import { Parser } from "../Parser.js";
import type { ParseFlags, ParseResult } from "../types.js";
import { parseNDigits, parseNumericPattern } from "../utils.js";
import type { ParseFlags, ParseResult, ParserOptions } from "../types.js";
import {
parseNDigits,
parseMinNDigits,
parseNumericPattern,
} from "../utils.js";

export class Hour0To11Parser extends Parser<number> {
priority = 70;

parse(dateString: string, token: string, match: Match): ParseResult<number> {
parse(
dateString: string,
token: string,
match: Match,
options: ParserOptions,
): ParseResult<number> {
switch (token) {
case "K":
return parseNumericPattern(numericPatterns.hour11h, dateString);
case "K": {
const pattern = options.strict
? numericPatterns.minSingleDigits
: numericPatterns.hour11h;
return parseNumericPattern(pattern, dateString);
}
case "Ko":
return match.ordinalNumber(dateString, { unit: "hour" });
default:
return parseNDigits(token.length, dateString);
default: {
const parseFn = options.strict ? parseMinNDigits : parseNDigits;
return parseFn(token.length, dateString);
}
}
}

Expand Down
29 changes: 22 additions & 7 deletions src/parse/_lib/parsers/Hour0to23Parser.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
import type { Match } from "../../../locale/types.js";
import { numericPatterns } from "../constants.js";
import { Parser } from "../Parser.js";
import type { ParseFlags, ParseResult } from "../types.js";
import { parseNDigits, parseNumericPattern } from "../utils.js";
import type { ParseFlags, ParseResult, ParserOptions } from "../types.js";
import {
parseNDigits,
parseNumericPattern,
parseMinNDigits,
} from "../utils.js";

export class Hour0to23Parser extends Parser<number> {
priority = 70;

parse(dateString: string, token: string, match: Match): ParseResult<number> {
parse(
dateString: string,
token: string,
match: Match,
options: ParserOptions,
): ParseResult<number> {
switch (token) {
case "H":
return parseNumericPattern(numericPatterns.hour23h, dateString);
case "H": {
const pattern = options.strict
? numericPatterns.minSingleDigits
: numericPatterns.hour23h;
return parseNumericPattern(pattern, dateString);
}
case "Ho":
return match.ordinalNumber(dateString, { unit: "hour" });
default:
return parseNDigits(token.length, dateString);
default: {
const parseFn = options.strict ? parseMinNDigits : parseNDigits;
return parseFn(token.length, dateString);
}
}
}

Expand Down
29 changes: 22 additions & 7 deletions src/parse/_lib/parsers/Hour1To24Parser.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
import type { Match } from "../../../locale/types.js";
import { numericPatterns } from "../constants.js";
import { Parser } from "../Parser.js";
import type { ParseFlags, ParseResult } from "../types.js";
import { parseNDigits, parseNumericPattern } from "../utils.js";
import type { ParseFlags, ParseResult, ParserOptions } from "../types.js";
import {
parseNDigits,
parseMinNDigits,
parseNumericPattern,
} from "../utils.js";

export class Hour1To24Parser extends Parser<number> {
priority = 70;

parse(dateString: string, token: string, match: Match): ParseResult<number> {
parse(
dateString: string,
token: string,
match: Match,
options: ParserOptions,
): ParseResult<number> {
switch (token) {
case "k":
return parseNumericPattern(numericPatterns.hour24h, dateString);
case "k": {
const pattern = options.strict
? numericPatterns.minSingleDigits
: numericPatterns.hour24h;
return parseNumericPattern(pattern, dateString);
}
case "ko":
return match.ordinalNumber(dateString, { unit: "hour" });
default:
return parseNDigits(token.length, dateString);
default: {
const parseFn = options.strict ? parseMinNDigits : parseNDigits;
return parseFn(token.length, dateString);
}
}
}

Expand Down
29 changes: 22 additions & 7 deletions src/parse/_lib/parsers/Hour1to12Parser.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
import type { Match } from "../../../locale/types.js";
import { numericPatterns } from "../constants.js";
import { Parser } from "../Parser.js";
import type { ParseFlags, ParseResult } from "../types.js";
import { parseNDigits, parseNumericPattern } from "../utils.js";
import type { ParseFlags, ParseResult, ParserOptions } from "../types.js";
import {
parseNDigits,
parseNumericPattern,
parseMinNDigits,
} from "../utils.js";

export class Hour1to12Parser extends Parser<number> {
priority = 70;

parse(dateString: string, token: string, match: Match): ParseResult<number> {
parse(
dateString: string,
token: string,
match: Match,
options: ParserOptions,
): ParseResult<number> {
switch (token) {
case "h":
return parseNumericPattern(numericPatterns.hour12h, dateString);
case "h": {
const pattern = options.strict
? numericPatterns.minSingleDigits
: numericPatterns.hour12h;
return parseNumericPattern(pattern, dateString);
}
case "ho":
return match.ordinalNumber(dateString, { unit: "hour" });
default:
return parseNDigits(token.length, dateString);
default: {
const parseFn = options.strict ? parseMinNDigits : parseNDigits;
return parseFn(token.length, dateString);
}
}
}

Expand Down
15 changes: 11 additions & 4 deletions src/parse/_lib/parsers/ISODayParser.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
import type { Match } from "../../../locale/types.js";
import { setISODay } from "../../../setISODay/index.js";
import { Parser } from "../Parser.js";
import type { ParseFlags, ParseResult } from "../types.js";
import { mapValue, parseNDigits } from "../utils.js";
import type { ParseFlags, ParseResult, ParserOptions } from "../types.js";
import { mapValue, parseNDigits, parseMinNDigits } from "../utils.js";

// ISO day of week
export class ISODayParser extends Parser<number> {
priority = 90;

parse(dateString: string, token: string, match: Match): ParseResult<number> {
parse(
dateString: string,
token: string,
match: Match,
options: ParserOptions,
): ParseResult<number> {
const valueCallback = (value: number) => {
if (value === 0) {
return 7;
Expand All @@ -20,7 +25,9 @@ export class ISODayParser extends Parser<number> {
// 2
case "i":
case "ii": // 02
return parseNDigits(token.length, dateString);
return options.strict
? parseMinNDigits(token.length, dateString)
: parseNDigits(token.length, dateString);
// 2nd
case "io":
return match.ordinalNumber(dateString, { unit: "day" });
Expand Down