Commitcacd9e6

committed

fix aggressive compression of hours into a single day

1 parenta307efa commitcacd9e6Copy full SHA for cacd9e6

File tree

+16

-1

lines changed

+16

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,8 @@ export function roundToSingleUnit(duration: Duration, {relativeTo = Date.now()}:`
`147`	`147`	`if(minutes>=55)hours+=Math.round(minutes/60)`
`148`	`148`	`if(hours\|\|days\|\|weeks\|\|months\|\|years)minutes=0`
`149`	`149`
`150`		`-if(hours>=21)days+=Math.round(hours/24)`
	`150`	`+if(days&&hours>=12)days+=Math.round(hours/24)`
	`151`	`+if(!days&&hours>=21)days+=Math.round(hours/24)`
`151`	`152`	`if(days\|\|weeks\|\|months\|\|years)hours=0`
`152`	`153`
`153`	`154`	`constcurrentYear=relativeTo.getFullYear()`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,11 @@ suite('duration', function () {`
`215`	`215`	`input:'2021-10-29T14:46:00.000Z',`
`216`	`216`	`expected:'-P1Y',`
`217`	`217`	`},`
	`218`	`+{`
	`219`	`+now:'2023-03-23T12:03:00.000Z',`
	`220`	`+input:'2023-03-21T16:03:00.000Z',`
	`221`	`+expected:'-P1DT20H',`
	`222`	`+},`
`218`	`223`	`])`
`219`	`224`	`for(const{input, now, precision='millisecond', expected}ofelapsed){`
`220`	`225`	test(`${input} is${expected} elapsed from${now} (precision${precision})`,()=>{
`@@ -235,6 +240,8 @@ suite('duration', function () {`
`235`	`240`	`['PT1H55M','PT2H'],`
`236`	`241`	`['PT20H','PT20H'],`
`237`	`242`	`['PT21H','P1D'],`
	`243`	`+['P1DT20H','P2D'],`
	`244`	`+['P1DT18H','P2D'],`
`238`	`245`	`['P4D','P4D',{relativeTo:newDate('2023-07-01T00:00:00')}],`
`239`	`246`	`['-P4D','-P4D',{relativeTo:newDate('2023-07-01T00:00:00')}],`
`240`	`247`	`['P6D','P1W',{relativeTo:newDate('2023-07-01T00:00:00')}],`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1752,6 +1752,13 @@ suite('relative-time', function () {`
`1752`	`1752`	`tense:'past',`
`1753`	`1753`	`expected:'2 years, 10 days',`
`1754`	`1754`	`},`
	`1755`	`+{`
	`1756`	`+reference:'2023-03-23T12:03:00.000Z',`
	`1757`	`+datetime:'2023-03-21T16:03:00.000Z',`
	`1758`	`+format:'relative',`
	`1759`	`+tense:'past',`
	`1760`	`+expected:'2 days ago',`
	`1761`	`+},`
`1755`	`1762`	`])`
`1756`	`1763`
`1757`	`1764`	`for(const{`

Comments

(0)