Skip to content

fix: date-fns format string compatible #111

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

Merged
merged 2 commits into from
Jul 31, 2020
Merged

fix: date-fns format string compatible #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a990362
fix: date-fns format string compatible
fireairforce Jul 30, 2020
5dfb445
feat: add test case
fireairforce Jul 30, 2020
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
15 changes: 13 additions & 2 deletions src/generate/dateFns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ const dealLocal = (str: string) => {
return str.replace(/_/g, '');
};

const localeParse = (format: string) => {
return format
.replace(/Y/g, 'y')
.replace(/D/g, 'd')
.replace(/gggg/, 'yyyy')
.replace(/g/g, 'G')
.replace(/([Ww])o/g, 'wo');
};

const generateConfig: GenerateConfig<Date> = {
// get
getNow: () => new Date(),
Expand Down Expand Up @@ -66,11 +75,13 @@ const generateConfig: GenerateConfig<Date> = {
if (!isValid(date)) {
return null;
}
return formatDate(date, format, { locale: Locale[dealLocal(locale)] });
return formatDate(date, localeParse(format), {
locale: Locale[dealLocal(locale)],
});
},
parse: (locale, text, formats) => {
for (let i = 0; i < formats.length; i += 1) {
const format = formats[i];
const format = localeParse(formats[i]);
const formatText = text;
const date = parseDate(formatText, format, new Date(), {
locale: Locale[dealLocal(locale)],
Expand Down
29 changes: 11 additions & 18 deletions tests/generate.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ describe('Picker.Generate', () => {
date = generateConfig.setMinute(date, 3);
date = generateConfig.setSecond(date, 5);

const formatStr = name === 'date-fns' ? 'yyyy-MM-dd HH:mm:ss' : 'YYYY-MM-DD HH:mm:ss';
expect(generateConfig.locale.format('en_US', date, formatStr)).toEqual(
expect(generateConfig.locale.format('en_US', date, 'YYYY-MM-DD HH:mm:ss')).toEqual(
'2020-10-23 02:03:05',
);
});
Expand All @@ -55,8 +54,7 @@ describe('Picker.Generate', () => {
date = generateConfig.addYear(date, 2);
date = generateConfig.addMonth(date, 2);
date = generateConfig.addDate(date, 2);
const formatStr = name === 'date-fns' ? 'yyyy-MM-dd' : 'YYYY-MM-DD';
expect(generateConfig.locale.format('en_US', date, formatStr)).toEqual('1992-11-05');
expect(generateConfig.locale.format('en_US', date, 'YYYY-MM-DD')).toEqual('1992-11-05');
});

it('isAfter', () => {
Expand All @@ -74,41 +72,37 @@ describe('Picker.Generate', () => {
describe('locale', () => {
describe('parse', () => {
it('basic', () => {
const formatStr1 = name === 'date-fns' ? 'yyyy-MM-dd' : 'YYYY-MM-DD';
const formatStr2 = name === 'date-fns' ? 'dd/mm/yyyy' : 'DD/MM/YYYY';
['2000-01-02', '02/01/2000'].forEach(str => {
const date = generateConfig.locale.parse('en_US', str, [formatStr1, formatStr2]);
const date = generateConfig.locale.parse('en_US', str, ['YYYY-MM-DD', 'DD/MM/YYYY']);

expect(generateConfig.locale.format('en_US', date!, formatStr1)).toEqual(
expect(generateConfig.locale.format('en_US', date!, 'YYYY-MM-DD')).toEqual(
'2000-01-02',
);
});
});

it('week', () => {
const formatStr = name === 'date-fns' ? 'GGGG-wo' : 'gggg-wo';
if (name !== 'date-fns') {
expect(
generateConfig.locale.format(
'en_US',
generateConfig.locale.parse('en_US', '2019-1st', [formatStr])!,
formatStr,
generateConfig.locale.parse('en_US', '2019-1st', ['gggg-wo'])!,
'gggg-wo',
),
).toEqual('2019-1st');

expect(
generateConfig.locale.format(
'zh_CN',
generateConfig.locale.parse('zh_CN', '2019-45周', [formatStr])!,
formatStr,
generateConfig.locale.parse('zh_CN', '2019-45周', ['gggg-wo'])!,
'gggg-wo',
),
).toEqual('2019-45周');
} else {
expect(
generateConfig.locale.format(
'en_US',
generateConfig.locale.parse('en_US', '2019-1st', [formatStr])!,
formatStr,
generateConfig.locale.parse('en_US', '2019-1st', ['GGGG-wo'])!,
'GGGG-wo',
),
).toEqual(null);
}
Expand All @@ -120,12 +114,11 @@ describe('Picker.Generate', () => {
expect(generateConfig.locale.getWeekFirstDay('en_US')).toEqual(0);
expect(generateConfig.locale.getWeekFirstDay('zh_CN')).toEqual(1);

const formatStr = name === 'date-fns' ? 'yyyy-MM-dd' : 'YYYY-MM-DD';
// Should keep same weekday
['en_US', 'zh_CN'].forEach(() => {
expect(
generateConfig.getWeekDay(
generateConfig.locale.parse('en_US', '2000-01-01', [formatStr])!,
generateConfig.locale.parse('en_US', '2000-01-01', ['YYYY-MM-DD'])!,
),
).toEqual(6);
});
Expand Down