fix: DateFNS locale fallback mapping (#763)

* fix: local mapping * test: add test case * test: more test case
react-component · Feb 27, 2024 · 8f71ab1 · 8f71ab1
1 parent 73032a3
commit 8f71ab1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/src/generate/dateFns.ts b/src/generate/dateFns.ts
@@ -23,16 +23,15 @@ import {
   setSeconds,
   setYear,
   startOfWeek,
+  type Locale,
 } from 'date-fns';
-import * as Locale from 'date-fns/locale';
+import * as locales from 'date-fns/locale';
 import type { GenerateConfig } from '.';
 
-const localeMap: Record<string, string> = {
-  ko_KR: 'ko'
-};
-
-const dealLocal = (str: string) => {
-  return localeMap[str] || str.replace(/_/g, '');
+const getLocale = (locale: string): Locale => {
+  return (
+    locales[locale] || locales[locale.replace(/_/g, '')] || locales[locale.replace(/_.*$/g, '')]
+  );
 };
 
 const localeParse = (format: string) => {
@@ -76,21 +75,21 @@ const generateConfig: GenerateConfig<Date> = {
 
   locale: {
     getWeekFirstDay: (locale) => {
-      const clone = Locale[dealLocal(locale)];
+      const clone = getLocale(locale);
       return clone.options.weekStartsOn;
     },
     getWeekFirstDate: (locale, date) => {
-      return startOfWeek(date, { locale: Locale[dealLocal(locale)] });
+      return startOfWeek(date, { locale: getLocale(locale) });
     },
     getWeek: (locale, date) => {
-      return getWeek(date, { locale: Locale[dealLocal(locale)] });
+      return getWeek(date, { locale: getLocale(locale) });
     },
     getShortWeekDays: (locale) => {
-      const clone = Locale[dealLocal(locale)];
+      const clone = getLocale(locale);
       return Array.from({ length: 7 }).map((_, i) => clone.localize.day(i, { width: 'short' }));
     },
     getShortMonths: (locale) => {
-      const clone = Locale[dealLocal(locale)];
+      const clone = getLocale(locale);
       return Array.from({ length: 12 }).map((_, i) =>
         clone.localize.month(i, { width: 'abbreviated' }),
       );
@@ -100,15 +99,15 @@ const generateConfig: GenerateConfig<Date> = {
         return null;
       }
       return formatDate(date, localeParse(format), {
-        locale: Locale[dealLocal(locale)],
+        locale: getLocale(locale),
       });
     },
     parse: (locale, text, formats) => {
       for (let i = 0; i < formats.length; i += 1) {
         const format = localeParse(formats[i]);
         const formatText = text;
         const date = parseDate(formatText, format, new Date(), {
-          locale: Locale[dealLocal(locale)],
+          locale: getLocale(locale),
         });
         if (isValid(date)) {
           return date;

diff --git a/tests/generate.spec.tsx b/tests/generate.spec.tsx
@@ -309,3 +309,17 @@ describe('Generate:dayjs', () => {
     expect(dateb).toEqual('2022-11-23 13:05');
   });
 });
+
+describe('Generate:date-fns', () => {
+  it('getWeekFirstDay', () => {
+    expect(dateFnsGenerateConfig.locale.getWeekFirstDay('en_US')).toEqual(0);
+    expect(dateFnsGenerateConfig.locale.getWeekFirstDay('zh_CN')).toEqual(1);
+    expect(dateFnsGenerateConfig.locale.getWeekFirstDay('ar_EG')).toEqual(0);
+    expect(dateFnsGenerateConfig.locale.getWeekFirstDay('ar_MA')).toEqual(1);
+    expect(dateFnsGenerateConfig.locale.getWeekFirstDay('ar')).toEqual(6);
+    expect(dateFnsGenerateConfig.locale.getWeekFirstDay('ar')).toEqual(6);
+    expect(dateFnsGenerateConfig.locale.getWeekFirstDay('ko_KR')).toEqual(0);
+    expect(dateFnsGenerateConfig.locale.getWeekFirstDay('it_IT')).toEqual(1);
+    expect(dateFnsGenerateConfig.locale.getWeekFirstDay('fr_FR')).toEqual(1);
+  });
+});