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

chore(fmt): cleanup duration code #6308

Closed
wants to merge 2 commits into from
Closed

chore(fmt): cleanup duration code #6308

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd4701
initial commit
timreichen Dec 27, 2024
04336d2
update
timreichen Dec 27, 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
116 changes: 49 additions & 67 deletions fmt/duration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,53 +23,49 @@ function addZero(num: number, digits: number) {
return String(num).padStart(digits, "0");
}

interface DurationObject {
d: number;
h: number;
m: number;
s: number;
ms: number;
us: number;
ns: number;
}
type DurationPartType =
| "days"
| "hours"
| "minutes"
| "seconds"
| "milliseconds"
| "microseconds"
| "nanoseconds";

const keyList: Record<keyof DurationObject, string> = {
d: "days",
h: "hours",
m: "minutes",
s: "seconds",
ms: "milliseconds",
us: "microseconds",
ns: "nanoseconds",
};
const NARROW_DURATION_NAME_MAP = new Map<DurationPartType, string>([
["days", "d"],
["hours", "h"],
["minutes", "m"],
["seconds", "s"],
["milliseconds", "ms"],
["microseconds", "µs"],
["nanoseconds", "ns"],
]);
const FULL_EN_DURATION_NAME_MAP = new Map<DurationPartType, string>([
["days", "days"],
["hours", "hours"],
["minutes", "minutes"],
["seconds", "seconds"],
["milliseconds", "milliseconds"],
["microseconds", "microseconds"],
["nanoseconds", "nanoseconds"],
]);

/** Parse milliseconds into a duration. */
function millisecondsToDurationObject(ms: number): DurationObject {
/** Parse milliseconds into a duration parts. */
function millisecondsToDurationParts(
ms: number,
): { type: DurationPartType; value: number }[] {
// Duration cannot be negative
const millis = Math.abs(ms);
const millisFraction = millis.toFixed(7).slice(-7, -1);
return {
d: Math.trunc(millis / 86400000),
h: Math.trunc(millis / 3600000) % 24,
m: Math.trunc(millis / 60000) % 60,
s: Math.trunc(millis / 1000) % 60,
ms: Math.trunc(millis) % 1000,
us: +millisFraction.slice(0, 3),
ns: +millisFraction.slice(3, 6),
};
}

function durationArray(
duration: DurationObject,
): { type: keyof DurationObject; value: number }[] {
return [
{ type: "d", value: duration.d },
{ type: "h", value: duration.h },
{ type: "m", value: duration.m },
{ type: "s", value: duration.s },
{ type: "ms", value: duration.ms },
{ type: "us", value: duration.us },
{ type: "ns", value: duration.ns },
{ type: "days", value: Math.trunc(millis / 86400000) },
{ type: "hours", value: Math.trunc(millis / 3600000) % 24 },
{ type: "minutes", value: Math.trunc(millis / 60000) % 60 },
{ type: "seconds", value: Math.trunc(millis / 1000) % 60 },
{ type: "milliseconds", value: Math.trunc(millis) % 1000 },
{ type: "microseconds", value: +millisFraction.slice(0, 3) },
{ type: "nanoseconds", value: +millisFraction.slice(3, 6) },
];
}

Expand Down Expand Up @@ -125,38 +121,24 @@ export function format(
ignoreZero = false,
} = options ?? {};

const duration = millisecondsToDurationObject(ms);
const durationArr = durationArray(duration);
const parts = millisecondsToDurationParts(ms);

switch (style) {
case "narrow": {
if (ignoreZero) {
return `${
durationArr.filter((x) => x.value).map((x) =>
`${x.value}${x.type === "us" ? "µs" : x.type}`
)
.join(" ")
}`;
}
return `${
durationArr.map((x) => `${x.value}${x.type === "us" ? "µs" : x.type}`)
.join(" ")
}`;
const arr = ignoreZero ? parts.filter((x) => x.value) : parts;
return arr
.map((x) => `${x.value}${NARROW_DURATION_NAME_MAP.get(x.type)}`)
.join(" ");
}
case "full": {
if (ignoreZero) {
return `${
durationArr.filter((x) => x.value).map((x) =>
`${x.value} ${keyList[x.type]}`
).join(", ")
}`;
}
return `${
durationArr.map((x) => `${x.value} ${keyList[x.type]}`).join(", ")
}`;
const arr = ignoreZero ? parts.filter((x) => x.value) : parts;
return arr
.map((x) => `${x.value} ${FULL_EN_DURATION_NAME_MAP.get(x.type)}`)
.join(", ");
}
case "digital": {
const arr = durationArr.map((x) =>
["ms", "us", "ns"].includes(x.type)
const arr = parts.map((x) =>
["milliseconds", "microseconds", "nanoseconds"].includes(x.type)
? addZero(x.value, 3)
: addZero(x.value, 2)
);
Expand Down
Loading