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 dependencies #200

Merged
merged 4 commits into from Dec 8, 2022
Merged

Update dependencies #200

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86362e5
Update dependencies
justingrant Dec 8, 2022
50eac14
Update node version used for CI lint step
justingrant Dec 8, 2022
4a2a15b
Add backwards-compatible JSON import
justingrant Dec 8, 2022
e233017
Try to fix rollup CJS config error
justingrant Dec 8, 2022
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
48 changes: 35 additions & 13 deletions lib/ecmascript.ts
View file
Open in desktop
Expand Up @@ -2024,18 +2024,18 @@ export function CalendarFields<F extends Iterable<string>>(calendar: Temporal.Ca
return result as unknown as F;
}

export function CalendarMergeFields(
export function CalendarMergeFields<Base extends Record<string, unknown>, ToAdd extends Record<string, unknown>>(
calendar: Temporal.CalendarProtocol,
fields: Record<string, unknown>,
additionalFields: Record<string, unknown>
fields: Base,
additionalFields: ToAdd
) {
const calMergeFields = calendar.mergeFields;
if (!calMergeFields) {
return { ...fields, ...additionalFields };
}
const result = Reflect.apply(calMergeFields, calendar, [fields, additionalFields]);
if (!IsObject(result)) throw new TypeError('bad return from calendar.mergeFields()');
return result;
return result as Base & ToAdd;
}

export function CalendarDateAdd(
Expand Down Expand Up @@ -2609,17 +2609,17 @@ export function TemporalDurationToString(
} = RoundDuration(0, 0, 0, 0, 0, 0, seconds, ms, µs, ns, increment, unit, roundingMode));
}

const dateParts = [];
const dateParts: string[] = [];
if (years) dateParts.push(`${formatNumber(MathAbs(years))}Y`);
if (months) dateParts.push(`${formatNumber(MathAbs(months))}M`);
if (weeks) dateParts.push(`${formatNumber(MathAbs(weeks))}W`);
if (days) dateParts.push(`${formatNumber(MathAbs(days))}D`);

const timeParts = [];
const timeParts: string[] = [];
if (hours) timeParts.push(`${formatNumber(MathAbs(hours))}H`);
if (minutes) timeParts.push(`${formatNumber(MathAbs(minutes))}M`);

const secondParts = [];
const secondParts: string[] = [];
let total = TotalDurationNanoseconds(0, 0, 0, seconds, ms, µs, ns, 0);
let nsBigInt: JSBI, µsBigInt: JSBI, msBigInt: JSBI, secondsBigInt: JSBI;
({ quotient: total, remainder: nsBigInt } = divmod(total, THOUSAND));
Expand Down Expand Up @@ -3657,7 +3657,11 @@ export function BalanceDurationRelative(
days -= oneYearDays;
years += sign;
relativeTo = newRelativeTo;
({ relativeTo: newRelativeTo, days: oneYearDays } = MoveRelativeDate(calendar, relativeTo, oneYear));
({ relativeTo: newRelativeTo, days: oneYearDays } = MoveRelativeDate(
calendar,
relativeTo as Temporal.PlainDate,
oneYear
));
}

// balance days up to months
Expand All @@ -3671,7 +3675,11 @@ export function BalanceDurationRelative(
days -= oneMonthDays;
months += sign;
relativeTo = newRelativeTo;
({ relativeTo: newRelativeTo, days: oneMonthDays } = MoveRelativeDate(calendar, relativeTo, oneMonth));
({ relativeTo: newRelativeTo, days: oneMonthDays } = MoveRelativeDate(
calendar,
relativeTo as Temporal.PlainDate,
oneMonth
));
}

// balance months up to years
Expand All @@ -3692,10 +3700,16 @@ export function BalanceDurationRelative(
months -= oneYearMonths;
years += sign;
relativeTo = newRelativeTo;
newRelativeTo = CalendarDateAdd(calendar, relativeTo, oneYear, undefined, dateAdd);
newRelativeTo = CalendarDateAdd(calendar, relativeTo as Temporal.PlainDate, oneYear, undefined, dateAdd);
const untilOptions = ObjectCreate(null);
untilOptions.largestUnit = 'month';
untilResult = CalendarDateUntil(calendar, relativeTo, newRelativeTo, untilOptions, dateUntil);
untilResult = CalendarDateUntil(
calendar,
relativeTo as Temporal.PlainDate,
newRelativeTo,
untilOptions,
dateUntil
);
oneYearMonths = GetSlot(untilResult, MONTHS);
}
break;
Expand All @@ -3713,7 +3727,11 @@ export function BalanceDurationRelative(
days -= oneMonthDays;
months += sign;
relativeTo = newRelativeTo;
({ relativeTo: newRelativeTo, days: oneMonthDays } = MoveRelativeDate(calendar, relativeTo, oneMonth));
({ relativeTo: newRelativeTo, days: oneMonthDays } = MoveRelativeDate(
calendar,
relativeTo as Temporal.PlainDate,
oneMonth
));
}
break;
}
Expand All @@ -3730,7 +3748,11 @@ export function BalanceDurationRelative(
days -= oneWeekDays;
weeks += sign;
relativeTo = newRelativeTo;
({ relativeTo: newRelativeTo, days: oneWeekDays } = MoveRelativeDate(calendar, relativeTo, oneWeek));
({ relativeTo: newRelativeTo, days: oneWeekDays } = MoveRelativeDate(
calendar,
relativeTo as Temporal.PlainDate,
oneWeek
));
}
break;
}
Expand Down