fix: Duration add/subtract #2337
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alexander-ulaev
changed the title
Codecov Report
@@ Coverage Diff @@
## dev #2337 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 183 183
Lines 2111 2146 +35
Branches 555 567 +12
=========================================
+ Hits 2111 2146 +35
|
iamkun
reviewed
Jun 22, 2023
src/plugin/duration/index.js
Outdated
| .add(duration.hours(), 'hour') | ||
| .add(duration.minutes(), 'minute') | ||
| .add(duration.seconds(), 'second') | ||
| .add(duration.milliseconds(), 'millisecond') |
There was a problem hiding this comment.
a little trick to minimize the code, pass the third argument to combine add and subtract together.
// manipulateDuration(this, value, 1)
// manipulateDuration(this, value, -1)
// e.g. .add(duration.months() * (-1), 'month')
also, one thing that confused me, is why adding value.asMilliseconds() is not the correct result.
It should be the real ms between the two dates.
There was a problem hiding this comment.
thanks for the tip to improve the code
value.asMilliseconds() executed without date context and In this case, month is equal to 30 days. I think it's correct. (moment js has same behavior)
iamkun
reviewed
Jun 23, 2023
src/plugin/duration/index.js
Outdated
| .add(duration.hours() * k, 'hour') | ||
| .add(duration.minutes() * k, 'minute') | ||
| .add(duration.seconds() * k, 'second') | ||
| .add(duration.milliseconds() * k, 'millisecond') |
There was a problem hiding this comment.
we can replace 'second' with 's' according to https://github.com/iamkun/dayjs/blob/dev/src/utils.js#L31
to save some bytes
the rest LGTM
|
Cheers |
github-actions bot
pushed a commit
that referenced
this pull request
Jul 1, 2023
## [1.11.9](v1.11.8...v1.11.9) (2023-07-01) ### Bug Fixes * Add null to min and max plugin return type ([#2355](#2355)) ([62d9042](62d9042)) * check if null passed to objectSupport parser ([#2175](#2175)) ([013968f](013968f)) * dayjs.diff improve performance ([#2244](#2244)) ([33c80e1](33c80e1)) * dayjs(null) throws error, not return dayjs object as invalid date ([#2334](#2334)) ([c79e2f5](c79e2f5)) * objectSupport plugin causes an error when null is passed to dayjs function (closes [#2277](#2277)) ([#2342](#2342)) ([89bf31c](89bf31c)) * Optimize format method ([#2313](#2313)) ([1fe1b1d](1fe1b1d)) * update Duration plugin add/subtract take into account days in month ([#2337](#2337)) ([3b1060f](3b1060f)) * update MinMax plugin 1. ignore the 'null' in args 2. return the only one arg ([#2330](#2330)) ([3c2c6ee](3c2c6ee))
|
🎉 This PR is included in version 1.11.9 🎉 The release is available on: Your semantic-release bot 📦🚀 |
BePo65
pushed a commit
to BePo65/dayjs
that referenced
this pull request
Sep 20, 2023
## [1.11.9](iamkun/dayjs@v1.11.8...v1.11.9) (2023-07-01) ### Bug Fixes * Add null to min and max plugin return type ([iamkun#2355](iamkun#2355)) ([62d9042](iamkun@62d9042)) * check if null passed to objectSupport parser ([iamkun#2175](iamkun#2175)) ([013968f](iamkun@013968f)) * dayjs.diff improve performance ([iamkun#2244](iamkun#2244)) ([33c80e1](iamkun@33c80e1)) * dayjs(null) throws error, not return dayjs object as invalid date ([iamkun#2334](iamkun#2334)) ([c79e2f5](iamkun@c79e2f5)) * objectSupport plugin causes an error when null is passed to dayjs function (closes [iamkun#2277](iamkun#2277)) ([iamkun#2342](iamkun#2342)) ([89bf31c](iamkun@89bf31c)) * Optimize format method ([iamkun#2313](iamkun#2313)) ([1fe1b1d](iamkun@1fe1b1d)) * update Duration plugin add/subtract take into account days in month ([iamkun#2337](iamkun#2337)) ([3b1060f](iamkun@3b1060f)) * update MinMax plugin 1. ignore the 'null' in args 2. return the only one arg ([iamkun#2330](iamkun#2330)) ([3c2c6ee](iamkun@3c2c6ee))
BePo65
pushed a commit
to BePo65/dayjs
that referenced
this pull request
Sep 23, 2023
## [1.11.9](iamkun/dayjs@v1.11.8...v1.11.9) (2023-07-01) ### Bug Fixes * Add null to min and max plugin return type ([iamkun#2355](iamkun#2355)) ([62d9042](iamkun@62d9042)) * check if null passed to objectSupport parser ([iamkun#2175](iamkun#2175)) ([013968f](iamkun@013968f)) * dayjs.diff improve performance ([iamkun#2244](iamkun#2244)) ([33c80e1](iamkun@33c80e1)) * dayjs(null) throws error, not return dayjs object as invalid date ([iamkun#2334](iamkun#2334)) ([c79e2f5](iamkun@c79e2f5)) * objectSupport plugin causes an error when null is passed to dayjs function (closes [iamkun#2277](iamkun#2277)) ([iamkun#2342](iamkun#2342)) ([89bf31c](iamkun@89bf31c)) * Optimize format method ([iamkun#2313](iamkun#2313)) ([1fe1b1d](iamkun@1fe1b1d)) * update Duration plugin add/subtract take into account days in month ([iamkun#2337](iamkun#2337)) ([3b1060f](iamkun@3b1060f)) * update MinMax plugin 1. ignore the 'null' in args 2. return the only one arg ([iamkun#2330](iamkun#2330)) ([3c2c6ee](iamkun@3c2c6ee))
ohsory1324
pushed a commit
to ohsory1324/dayjs
that referenced
this pull request
Dec 20, 2023
This was referenced May 24, 2024
This was referenced Sep 12, 2024
This was referenced Sep 13, 2024
splashwizard
pushed a commit
to splashwizard/tracking-time
that referenced
this pull request
Oct 21, 2024
## [1.11.9](iamkun/dayjs@v1.11.8...v1.11.9) (2023-07-01) ### Bug Fixes * Add null to min and max plugin return type ([#2355](iamkun/dayjs#2355)) ([62d9042](iamkun/dayjs@62d9042)) * check if null passed to objectSupport parser ([#2175](iamkun/dayjs#2175)) ([013968f](iamkun/dayjs@013968f)) * dayjs.diff improve performance ([#2244](iamkun/dayjs#2244)) ([33c80e1](iamkun/dayjs@33c80e1)) * dayjs(null) throws error, not return dayjs object as invalid date ([#2334](iamkun/dayjs#2334)) ([c79e2f5](iamkun/dayjs@c79e2f5)) * objectSupport plugin causes an error when null is passed to dayjs function (closes [#2277](iamkun/dayjs#2277)) ([#2342](iamkun/dayjs#2342)) ([89bf31c](iamkun/dayjs@89bf31c)) * Optimize format method ([#2313](iamkun/dayjs#2313)) ([1fe1b1d](iamkun/dayjs@1fe1b1d)) * update Duration plugin add/subtract take into account days in month ([#2337](iamkun/dayjs#2337)) ([3b1060f](iamkun/dayjs@3b1060f)) * update MinMax plugin 1. ignore the 'null' in args 2. return the only one arg ([#2330](iamkun/dayjs#2330)) ([3c2c6ee](iamkun/dayjs@3c2c6ee))
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix Duration add/subtract doesn't take into account how many days in a month #2336