Parse month from string in customParseFormat #457

Kreozot · 2019-01-16T15:07:27Z

to handle 'MMM' and 'MMMM' formats (February, Feb, etc)

babel.config.js

Kreozot · 2019-01-16T15:09:25Z

src/index.js

@@ -64,15 +64,16 @@ const parseDate = (date) => {

 class Dayjs {
  constructor(cfg) {
+    this.$L = this.$L || parseLocale(cfg.locale, null, true) || L


to make locale available in parse() function

codecov-io · 2019-01-16T15:09:53Z

Codecov Report

Merging #457 into dev will not change coverage.
The diff coverage is 100%.

@@         Coverage Diff         @@
##            dev   #457   +/-   ##
===================================
  Coverage   100%   100%           
===================================
  Files        55     58    +3     
  Lines       484    525   +41     
  Branches     75     88   +13     
===================================
+ Hits        484    525   +41

Impacted Files	Coverage Δ
src/index.js	`100% <100%> (ø)`	⬆️
src/plugin/customParseFormat/index.js	`100% <100%> (ø)`	⬆️
src/locale/et.js	`100% <0%> (ø)`	⬆️
src/locale/nn.js	`100% <0%> (ø)`	⬆️
src/locale/es-do.js	`100% <0%> (ø)`	⬆️
src/locale/ar.js	`100% <0%> (ø)`	⬆️
src/locale/bg.js	`100% <0%> (ø)`	⬆️
src/locale/nl.js	`100% <0%> (ø)`	⬆️
src/locale/el.js	`100% <0%> (ø)`	⬆️
src/locale/fi.js	`100% <0%> (ø)`	⬆️
... and 33 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3bd06f2...56dba7c. Read the comment docs.

Kreozot · 2019-01-20T11:05:53Z

@iamkun Is it ok now?

iamkun · 2019-01-20T16:04:34Z

I'll test babel.config.js change if I got some time first.

src/plugin/customParseFormat/index.js

iamkun · 2019-02-18T11:29:41Z

babel.config.js tested on windows, works good.

iamkun · 2019-02-18T15:40:24Z

src/plugin/customParseFormat/index.js

+    MM: [match2, addInput('month')],
+    MMM: [matchWord, function (input) {
+      const locale = instance.$locale()
+      const { months } = locale


also consider monthsShort in some locales

why change locale before date parsing?

iamkun · 2019-02-18T17:15:40Z

src/plugin/customParseFormat/index.js

+        ? monthsShort.findIndex(month => month === input)
+        : months.findIndex(month => month.substr(0, 3) === input)
+      if (matchIndex < 0) {
+        throw new Error(`Failed to parse "${input}" as MMM`)


no error, just skip it like others

But suddenly it broke the tests on "Invalid Date" after parse corrupted string

So, am I should to bring errors back?

src/plugin/customParseFormat/index.js

test/plugin/customParseFormat.test.js

iamkun · 2019-02-19T05:17:51Z

test/plugin/customParseFormat.test.js

+  const inputUk = '2018 трав 03'
+  const format = 'YYYY MMM DD'
+  dayjs.locale(uk)
+  expect(dayjs(inputUk, format).valueOf()).toBe(moment(input, format).valueOf())


this is not a good test .

we should compare with

moment.locale('uk')

done.
I also write test with passing locale in config (btw, it is undocumented for now)

iamkun · 2019-02-19T05:20:33Z

test/plugin/customParseFormat.test.js

+})
+
+it('return Invalid Date when parse corrupt string', () => {
+  const input = '2018 Februaru 03'


I don't know why moment('2018 Februaru 03', 'YYYY MMMM DD') returns a valid date.

But we might should change Februaru to another error string

Kreozot · 2019-02-19T10:51:33Z

@iamkun Take a look, please!
And I also added case with passing locale in config to docs.

## [1.8.7](v1.8.6...v1.8.7) (2019-02-24) ### Bug Fixes * Add plugin type definitions ([#418](#418)) ([361d437](361d437)) * Add Swahili locale ([#508](#508)) ([b9cee84](b9cee84)) * Parse month string 'MMMM MMM (February, Feb)' in customParseFormat ([#457](#457)) ([f343206](f343206)) * Update declaration file .diff .isBefore .isSame .isAfter ([#496](#496)) ([4523275](4523275)) * Word orders corrections for locale 'fa' ([#491](#491)) ([56050c2](56050c2))

iamkun · 2019-02-24T10:00:23Z

🎉 This PR is included in version 1.8.7 🎉

The release is available on:

Your semantic-release bot 📦🚀

## [1.8.7](iamkun/dayjs@v1.8.6...v1.8.7) (2019-02-24) ### Bug Fixes * Add plugin type definitions ([#418](iamkun/dayjs#418)) ([361d437](iamkun/dayjs@361d437)) * Add Swahili locale ([#508](iamkun/dayjs#508)) ([b9cee84](iamkun/dayjs@b9cee84)) * Parse month string 'MMMM MMM (February, Feb)' in customParseFormat ([#457](iamkun/dayjs#457)) ([f343206](iamkun/dayjs@f343206)) * Update declaration file .diff .isBefore .isSame .isAfter ([#496](iamkun/dayjs#496)) ([4523275](iamkun/dayjs@4523275)) * Word orders corrections for locale 'fa' ([#491](iamkun/dayjs#491)) ([56050c2](iamkun/dayjs@56050c2))

Sergey Sharov added 2 commits January 16, 2019 18:03

feat: parse month from string in customParseFormat

c905ed5

chore: rename babel config file for compatibility with Windows

b9fcd02

Kreozot commented Jan 16, 2019

View reviewed changes

babel.config.js Show resolved Hide resolved

Kreozot commented Jan 16, 2019

View reviewed changes

iamkun added the next release Will merge into next release label Feb 11, 2019

iamkun reviewed Feb 18, 2019

View reviewed changes

src/plugin/customParseFormat/index.js Outdated Show resolved Hide resolved

iamkun reviewed Feb 18, 2019

View reviewed changes

Sergey Sharov added 7 commits February 18, 2019 19:42

fix: parse month from different locales

ccb9a8f

refactor: move expressions to global object, raise error when fail parse

5c8d17e

test: test parsing month string after changing locale

bb0ec41

test: Invalid Date when parse corrupt month string

f1ebe9a

test: restore locale after each test (for tests independency)

77b8f3d

feat: using monthsShort when possible when parsing month strings

938912e

test: test for Invalid Date when parse corrupted short string

c51b78d

iamkun reviewed Feb 18, 2019

View reviewed changes

Sergey Sharov added 2 commits February 18, 2019 20:17

refactor: remove error when parsing month strings

cd71ff8

fix: fixing month parse failure

9ab77bc

iamkun reviewed Feb 18, 2019

View reviewed changes

src/plugin/customParseFormat/index.js Show resolved Hide resolved

iamkun reviewed Feb 18, 2019

View reviewed changes

src/plugin/customParseFormat/index.js Outdated Show resolved Hide resolved

iamkun reviewed Feb 18, 2019

View reviewed changes

src/plugin/customParseFormat/index.js Outdated Show resolved Hide resolved

refactor: locale moved to global variable

ae76586

iamkun reviewed Feb 18, 2019

View reviewed changes

test/plugin/customParseFormat.test.js Show resolved Hide resolved

fix: raise error to return Invalid Date when failing parse month string

f2ae692

iamkun reviewed Feb 19, 2019

View reviewed changes

test: changes in tests of month string parsing

d83cc26

Sergey Sharov added 3 commits February 19, 2019 13:19

test: more obvious error in error handling test

fbeb827

fix: fixed month parsing when digits in month string

057a0eb

docs: improved docs to CustomParseFormat plugin

56dba7c

iamkun merged commit f343206 into iamkun:dev Feb 23, 2019

iamkun added the released label Feb 24, 2019

mariusa mentioned this pull request Nov 20, 2019

MMM for 'ro' locale doesn't use monthsShort #736

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Parse month from string in customParseFormat #457

Parse month from string in customParseFormat #457

Kreozot commented Jan 16, 2019

Kreozot Jan 16, 2019

codecov-io commented Jan 16, 2019 •

edited

Loading

Kreozot commented Jan 20, 2019

iamkun commented Jan 20, 2019

iamkun commented Feb 18, 2019

iamkun Feb 18, 2019

iamkun Feb 18, 2019

iamkun Feb 18, 2019

Kreozot Feb 18, 2019

Kreozot Feb 18, 2019

Kreozot Feb 18, 2019

iamkun Feb 19, 2019

Kreozot Feb 19, 2019

iamkun Feb 19, 2019

Kreozot Feb 19, 2019

Kreozot commented Feb 19, 2019

iamkun commented Feb 24, 2019

Parse month from string in customParseFormat #457

Parse month from string in customParseFormat #457

Conversation

Kreozot commented Jan 16, 2019

Choose a reason for hiding this comment

codecov-io commented Jan 16, 2019 • edited Loading

Codecov Report

Kreozot commented Jan 20, 2019

iamkun commented Jan 20, 2019

iamkun commented Feb 18, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Kreozot commented Feb 19, 2019

iamkun commented Feb 24, 2019

codecov-io commented Jan 16, 2019 •

edited

Loading