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.

Sign up for GitHub

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

Jump to bottom

Update tests for "Limit valid values for DurationFormats to match upcoming limits in Temporal" #3988

Closed
wants to merge 7 commits into from
Closed

Update tests for "Limit valid values for DurationFormats to match upcoming limits in Temporal" #3988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
648fef8
Sync partitionDurationFormatPattern with latest spec draft
anba Jan 9, 2024
6c005f5
Fix bugs in style-digital-fractionalDigits-undefined.js
anba Jan 9, 2024
6b4499e
Use formatDurationFormatPattern for "/numeric-hour-with-zero-minutes-…
anba Jan 9, 2024
cd6b789
Add tests for negative durations with leading zero unit
anba Jan 9, 2024
3dbb467
Update numeric-hour-with-zero-minutes-and-non-zero-seconds for new de…
anba Jan 9, 2024
099d65e
Add test for negative zero inputs
anba Jan 9, 2024
282dc3d
Update tests for "Limit valid values for DurationFormats to match upc…
anba Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
257 changes: 151 additions & 106 deletions harness/testIntl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2509,175 +2509,219 @@ function isCanonicalizedStructurallyValidTimeZoneName(timeZone) {
/**
* @description Simplified PartitionDurationFormatPattern implementation which
* only supports the "en" locale.
* @param {Object} durationFormat the duration format object
* @param {Object} duration the duration record
* @param {String} style the duration format style
* @result {Array} an array with formatted duration parts
*/

function partitionDurationFormatPattern(duration, style = "short") {
const units = [
"years",
"months",
"weeks",
"days",
"hours",
"minutes",
"seconds",
"milliseconds",
"microseconds",
"nanoseconds",
];

function durationToFractionalSeconds(duration) {
function partitionDurationFormatPattern(durationFormat, duration) {
function durationToFractional(duration, exponent) {
let {
seconds = 0,
milliseconds = 0,
microseconds = 0,
nanoseconds = 0,
} = duration;

// Directly return seconds when no sub-seconds are present.
if (milliseconds === 0 && microseconds === 0 && nanoseconds === 0) {
return seconds;
// Directly return the duration amount when no sub-seconds are present.
switch (exponent) {
case 9: {
if (milliseconds === 0 && microseconds === 0 && nanoseconds === 0) {
return seconds;
}
break;
}
case 6: {
if (microseconds === 0 && nanoseconds === 0) {
return milliseconds;
}
break;
}
case 3: {
if (nanoseconds === 0) {
return microseconds;
}
break;
}
}

// Otherwise compute the overall amount of nanoseconds using BigInt to avoid
// loss of precision.
let ns_sec = BigInt(seconds) * 1_000_000_000n;
let ns_ms = BigInt(milliseconds) * 1_000_000n;
let ns_us = BigInt(microseconds) * 1_000n;
let ns = ns_sec + ns_ms + ns_us + BigInt(nanoseconds);
let ns = BigInt(nanoseconds);
switch (exponent) {
case 9:
ns += BigInt(seconds) * 1_000_000_000n;
// fallthrough
case 6:
ns += BigInt(milliseconds) * 1_000_000n;
// fallthrough
case 3:
ns += BigInt(microseconds) * 1_000n;
// fallthrough
}

let e = BigInt(10 ** exponent);

// Split the nanoseconds amount into seconds and sub-seconds.
let q = ns / 1_000_000_000n;
let r = ns % 1_000_000_000n;
// Split the nanoseconds amount into an integer and its fractional part.
let q = ns / e;
let r = ns % e;

// Pad sub-seconds, without any leading negative sign, to nine digits.
// Pad fractional part, without any leading negative sign, to |exponent| digits.
if (r < 0) {
r = -r;
}
r = String(r).padStart(9, "0");
r = String(r).padStart(exponent, "0");

// Return seconds with fractional part as a decimal string.
// Return the result as a decimal string.
return `${q}.${r}`;
}

const units = [
"years",
"months",
"weeks",
"days",
"hours",
"minutes",
"seconds",
"milliseconds",
"microseconds",
"nanoseconds",
];

let options = durationFormat.resolvedOptions();

// Only "en" is supported.
const locale = "en";
const numberingSystem = "latn";
const timeSeparator = ":";

let result = [];
let separated = false;
let needSeparator = false;
let displayNegativeSign = true;

for (let unit of units) {
// Absent units default to zero.
let value = duration[unit] ?? 0;

let display = "auto";
if (style === "digital") {
// Always display numeric units per GetDurationUnitOptions.
if (unit === "hours" || unit === "minutes" || unit === "seconds") {
display = "always";
}
let style = options[unit];
let display = options[unit + "Display"];

// NumberFormat requires singular unit names.
let numberFormatUnit = unit.slice(0, -1);

// Numeric seconds and sub-seconds are combined into a single value.
if (unit === "seconds") {
value = durationToFractionalSeconds(duration);
// Compute the matching NumberFormat options.
let nfOpts = Object.create(null);

// Numeric seconds and sub-seconds are combined into a single value.
let done = false;
if (unit === "seconds" || unit === "milliseconds" || unit === "microseconds") {
let nextStyle = options[units[units.indexOf(unit) + 1]];
if (nextStyle === "numeric") {
if (unit === "seconds") {
value = durationToFractional(duration, 9);
} else if (unit === "milliseconds") {
value = durationToFractional(duration, 6);
} else {
value = durationToFractional(duration, 3);
}

nfOpts.maximumFractionDigits = options.fractionalDigits ?? 9;
nfOpts.minimumFractionDigits = options.fractionalDigits ?? 0;
nfOpts.roundingMode = "trunc";

done = true;
}
}

// Display zero numeric minutes when seconds will be displayed.
let displayRequired = false;
if (unit === "minutes" && needSeparator) {
displayRequired = options.secondsDisplay === "always" ||
(duration.seconds ?? 0) !== 0 ||
(duration.milliseconds ?? 0) !== 0 ||
(duration.microseconds ?? 0) !== 0 ||
(duration.nanoseconds ?? 0) !== 0;
}

// "auto" display omits zero units.
if (value !== 0 || display !== "auto") {
// Map the DurationFormat style to a NumberFormat style.
let unitStyle = style;
if (style === "digital") {
if (unit === "hours") {
unitStyle = "numeric";
} else if (unit === "minutes" || unit === "seconds") {
unitStyle = "2-digit";
} else {
unitStyle = "short";
if (value !== 0 || display !== "auto" || displayRequired) {
// Display only the first negative value.
if (displayNegativeSign) {
displayNegativeSign = false;

// Set to negative zero to ensure the sign is displayed.
if (value === 0) {
let negative = units.some(unit => (duration[unit] ?? 0) < 0);
if (negative) {
value = -0;
}
}
} else {
nfOpts.signDisplay = "never";
}

// NumberFormat requires singular unit names.
let numberFormatUnit = unit.slice(0, -1);

// Compute the matching NumberFormat options.
let nfOpts;
if (unitStyle !== "numeric" && unitStyle !== "2-digit") {
// The value is formatted as a standalone unit.
nfOpts = {
numberingSystem,
style: "unit",
unit: numberFormatUnit,
unitDisplay: unitStyle,
};
} else {
let roundingMode = undefined;
let minimumFractionDigits = undefined;
let maximumFractionDigits = undefined;

// Numeric seconds include any sub-seconds.
if (style === "digital" && unit === "seconds") {
roundingMode = "trunc";
minimumFractionDigits = 0;
maximumFractionDigits = 9;
}
nfOpts.numberingSystem = options.numberingSystem;

// If the value is formatted as a 2-digit numeric value.
if (style === "2-digit") {
nfOpts.minimumIntegerDigits = 2;
}

// The value is formatted as a numeric unit.
nfOpts = {
numberingSystem,
minimumIntegerDigits: (unitStyle === "2-digit" ? 2 : 1),
roundingMode,
minimumFractionDigits,
maximumFractionDigits,
};
// If the value is formatted as a standalone unit.
if (style !== "numeric" && style !== "2-digit") {
nfOpts.style = "unit";
nfOpts.unit = numberFormatUnit;
nfOpts.unitDisplay = style;
}

let nf = new Intl.NumberFormat(locale, nfOpts);
let formatted = nf.formatToParts(value);

let list;
if (!needSeparator) {
list = [];
} else {
list = result[result.length - 1];

// Prepend the time separator before the formatted number.
list.push({
type: "literal",
value: timeSeparator,
});
}

// Format the numeric value.
let parts = nf.formatToParts(value);

// Add |numberFormatUnit| to the formatted number.
let list = [];
for (let {value, type} of formatted) {
for (let {value, type} of parts) {
list.push({type, value, unit: numberFormatUnit});
}

if (!separated) {
if (!needSeparator) {
// Prepend the separator before the next numeric unit.
if (unitStyle === "2-digit" || unitStyle === "numeric") {
separated = true;
if (style === "2-digit" || style === "numeric") {
needSeparator = true;
}

// Append the formatted number to |result|.
result.push(list);
} else {
let last = result[result.length - 1];

// Prepend the time separator before the formatted number.
last.push({
type: "literal",
value: timeSeparator,
});

// Concatenate |last| and the formatted number.
last.push(...list);
}
} else {
separated = false;
}

// No further units possible after "seconds" when style is "digital".
if (style === "digital" && unit === "seconds") {
if (done) {
break;
}
}

let listStyle = options.style;
if (listStyle === "digital") {
listStyle = "short";
}

let lf = new Intl.ListFormat(locale, {
type: "unit",
style: (style !== "digital" ? style : "short"),
style: listStyle,
});

// Collect all formatted units into a list of strings.
Expand Down Expand Up @@ -2705,11 +2749,12 @@ function partitionDurationFormatPattern(duration, style = "short") {

/**
* @description Return the formatted string from partitionDurationFormatPattern.
* @param {Object} durationFormat the duration format object
* @param {Object} duration the duration record
* @param {String} style the duration format style
* @result {String} a string containing the formatted duration
*/

function formatDurationFormatPattern(duration, style) {
return partitionDurationFormatPattern(duration, style).reduce((acc, e) => acc + e.value, "");
function formatDurationFormatPattern(durationFormat, duration) {
let parts = partitionDurationFormatPattern(durationFormat, duration);
return parts.reduce((acc, e) => acc + e.value, "");
}
Loading