Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions docs/api/subtract.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ console.log(duration.toDays().format('D[day], H:mm:ss')); // "-0day, 2:15:00"

The millisecond value is rounded to the nearest nanosecond before it is split into units, so a fraction that binary floating point cannot store exactly keeps its last digit: `new Duration(1.001).toMilliseconds().toParts()` returns `{ milliseconds: 1, microseconds: 1, nanoseconds: 0 }`.

This precision has a limit. A JavaScript number holds only about 15 to 17 significant digits, and as a duration grows, its whole milliseconds use up more of them, leaving fewer for the fraction. Durations up to about 100 days keep every nanosecond. Beyond that, the sub-millisecond part may be slightly off: for a duration of one year, the result can differ from the value you meant by up to about 2 nanoseconds.

## Immutability

Both input Date objects remain unchanged:
Expand Down
11 changes: 8 additions & 3 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ export default defineConfig(
'unicode-bom': 'error',
'yoda': 'error',

'@stylistic/array-bracket-spacing': ['warn', 'never'],
'@stylistic/arrow-spacing': 'warn',
'@stylistic/block-spacing': 'warn',
'@stylistic/comma-dangle': 'warn',
Expand All @@ -116,6 +115,14 @@ export default defineConfig(
'@stylistic/keyword-spacing': 'warn',
'@stylistic/linebreak-style': 'warn',
'@stylistic/lines-between-class-members': 'warn',
'@stylistic/list-style': ['warn', {
singleLine: { spacing: 'never' },
overrides: {
'()': 'off',
'<>': 'off',
'{}': { singleLine: { spacing: 'always' } }
}
}],
'@stylistic/member-delimiter-style': ['warn', { multiline: { delimiter: 'semi', requireLast: true }, singleline: { delimiter: 'semi', requireLast: false } }],
'@stylistic/new-parens': 'warn',
'@stylistic/no-extra-parens': ['warn', 'functions'],
Expand All @@ -127,8 +134,6 @@ export default defineConfig(
'@stylistic/no-trailing-spaces': 'warn',
'@stylistic/no-whitespace-before-property': 'warn',
'@stylistic/nonblock-statement-body-position': 'warn',
'@stylistic/object-curly-newline': 'warn',
'@stylistic/object-curly-spacing': ['warn', 'always'],
'@stylistic/padding-line-between-statements': 'warn',
'@stylistic/quotes': ['warn', 'single'],
'@stylistic/rest-spread-spacing': 'warn',
Expand Down
1,794 changes: 823 additions & 971 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "date-and-time",
"version": "4.7.1",
"version": "4.7.2",
"description": "The simplest, most intuitive date and time library",
"keywords": [
"date",
Expand Down Expand Up @@ -122,24 +122,24 @@
"type": "module",
"sideEffects": false,
"devDependencies": {
"@astrojs/starlight": "^0.42.8",
"@astrojs/starlight": "^0.43.1",
"@eslint/js": "^10.0.1",
"@rollup/plugin-alias": "^6.0.1",
"@rollup/plugin-terser": "^1.0.2",
"@stylistic/eslint-plugin": "^5.10.0",
"@stylistic/eslint-plugin": "^6.0.0",
"@types/node": "^26.6.6",
"@vitest/coverage-v8": "^5.0.5",
"astro": "^7.4.4",
"eslint": "^10.14.0",
"glob": "^14.0.3",
"prettier": "^3.9.10",
"rollup": "^4.67.3",
"@vitest/coverage-v8": "^5.1.0",
"astro": "^7.4.12",
"eslint": "^10.15.0",
"glob": "^14.0.6",
"prettier": "^3.10.1",
"rollup": "^4.68.3",
"rollup-plugin-dts": "^6.5.1",
"rollup-plugin-esbuild": "^6.2.1",
"tsx": "^4.23.15",
"typescript": "^6.0.3",
"typescript-eslint": "^8.72.1",
"vitest": "^5.0.5"
"typescript-eslint": "^8.72.2",
"vitest": "^5.1.0"
},
"allowScripts": {
"esbuild@0.28.2": true,
Expand Down
10 changes: 8 additions & 2 deletions src/datetime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,14 @@ export const dtfToParts = (dtf: Intl.DateTimeFormat, time: number): DateTimePart
}
return parts;
}, {
weekday: 4, year: 1970, month: 1, day: 1,
hour: 0, minute: 0, second: 0, fractionalSecond: 0,
weekday: 4,
year: 1970,
month: 1,
day: 1,
hour: 0,
minute: 0,
second: 0,
fractionalSecond: 0,
timezoneOffset: 0
});
};
Expand Down
11 changes: 9 additions & 2 deletions src/dtf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,15 @@ export const getDateTimeFormat = (zoneName: string): Intl.DateTimeFormat | undef
return cache.get(zoneName) ?? (() => {
try {
const dtf = new Intl.DateTimeFormat('en-US', {
hour12: false, weekday: 'short', year: 'numeric', month: 'numeric', day: 'numeric',
hour: 'numeric', minute: 'numeric', second: 'numeric', fractionalSecondDigits: 3,
hour12: false,
weekday: 'short',
year: 'numeric',
month: 'numeric',
day: 'numeric',
hour: 'numeric',
minute: 'numeric',
second: 'numeric',
fractionalSecondDigits: 3,
timeZone: zoneName
});

Expand Down
62 changes: 37 additions & 25 deletions src/duration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,43 +12,55 @@ interface DurationFormatter {
F?: number;
}

const nanosecondsPart = (parts: DurationFormatter, nanoseconds: number) => {
parts.F = nanoseconds;
// Each part function takes whole milliseconds and the sub-millisecond remainder in nanoseconds, both with the same sign.
const nanosecondsPart = (parts: DurationFormatter, milliseconds: number, nanoseconds: number) => {
parts.F = milliseconds * 1000000 + nanoseconds;
return parts;
};

const microsecondsPart = (parts: DurationFormatter, nanoseconds: number) => {
parts.f = Math.trunc(nanoseconds / 1000);
return nanosecondsPart(parts, Math.abs(nanoseconds % 1000));
const microsecondsPart = (parts: DurationFormatter, milliseconds: number, nanoseconds: number) => {
parts.f = milliseconds * 1000 + Math.trunc(nanoseconds / 1000);
return nanosecondsPart(parts, 0, Math.abs(nanoseconds % 1000));
};

const millisecondsPart = (parts: DurationFormatter, nanoseconds: number) => {
parts.S = Math.trunc(nanoseconds / 1000000);
return microsecondsPart(parts, Math.abs(nanoseconds % 1000000));
const millisecondsPart = (parts: DurationFormatter, milliseconds: number, nanoseconds: number) => {
parts.S = milliseconds;
return microsecondsPart(parts, 0, Math.abs(nanoseconds));
};

const secondsPart = (parts: DurationFormatter, nanoseconds: number) => {
parts.s = Math.trunc(nanoseconds / 1000000000);
return millisecondsPart(parts, Math.abs(nanoseconds % 1000000000));
const secondsPart = (parts: DurationFormatter, milliseconds: number, nanoseconds: number) => {
parts.s = Math.trunc(milliseconds / 1000);
return millisecondsPart(parts, Math.abs(milliseconds % 1000), Math.abs(nanoseconds));
};

const minutesPart = (parts: DurationFormatter, nanoseconds: number) => {
parts.m = Math.trunc(nanoseconds / 60000000000);
return secondsPart(parts, Math.abs(nanoseconds % 60000000000));
const minutesPart = (parts: DurationFormatter, milliseconds: number, nanoseconds: number) => {
parts.m = Math.trunc(milliseconds / 60000);
return secondsPart(parts, Math.abs(milliseconds % 60000), Math.abs(nanoseconds));
};

const hoursPart = (parts: DurationFormatter, nanoseconds: number) => {
parts.H = Math.trunc(nanoseconds / 3600000000000);
return minutesPart(parts, Math.abs(nanoseconds % 3600000000000));
const hoursPart = (parts: DurationFormatter, milliseconds: number, nanoseconds: number) => {
parts.H = Math.trunc(milliseconds / 3600000);
return minutesPart(parts, Math.abs(milliseconds % 3600000), Math.abs(nanoseconds));
};

const daysPart = (parts: DurationFormatter, nanoseconds: number) => {
parts.D = Math.trunc(nanoseconds / 86400000000000);
return hoursPart(parts, Math.abs(nanoseconds % 86400000000000));
const daysPart = (parts: DurationFormatter, milliseconds: number, nanoseconds: number) => {
parts.D = Math.trunc(milliseconds / 86400000);
return hoursPart(parts, Math.abs(milliseconds % 86400000), Math.abs(nanoseconds));
};

const toIntegerNanoseconds = (time: number) => {
return Math.sign(time) * Math.round(Math.abs(time) * 1000000);
// Scaling the whole value to nanoseconds would lose digits past Number.MAX_SAFE_INTEGER (about 104 days),
// so the fraction, which subtracts out of a double exactly, is split off first.
const splitTime = (time: number): [number, number] => {
const abs = Math.abs(time);
const milliseconds = Math.trunc(abs);
// The stored binary fraction is rounded on the magnitude, so a tie rounds away from zero for either sign.
const nanoseconds = Math.round((abs - milliseconds) * 1000000);
const timeSign = Math.sign(time);

// A fraction that rounds up to a whole millisecond carries into the milliseconds.
return nanoseconds >= 1000000
? [timeSign * (milliseconds + 1), 0]
: [timeSign * milliseconds, timeSign * nanoseconds];
};

const sign = (time: number) => {
Expand Down Expand Up @@ -130,16 +142,16 @@ const PART_NAMES = {
const createDescriptor = <T>(
time: number,
value: number,
decompose: (parts: DurationFormatter, nanoseconds: number) => DurationFormatter
decompose: (parts: DurationFormatter, milliseconds: number, nanoseconds: number) => DurationFormatter
): DurationDescriptor<T> => {
return {
value,
format: (formatString: string, numeral?: Numeral) => {
return format(decompose({}, toIntegerNanoseconds(time)), formatString, numeral);
return format(decompose({}, ...splitTime(time)), formatString, numeral);
},
toParts: () => {
const timeSign = Math.sign(time);
const parts = decompose({}, toIntegerNanoseconds(time));
const parts = decompose({}, ...splitTime(time));
const entries = Object.entries(parts) as [keyof DurationFormatter, number][];
const result: Record<string, number> = {};

Expand Down
Loading
Loading