fix and cleanup codes

jooy2 · Sep 16, 2024 · 8bd2e6c · 8bd2e6c
1 parent bd511f4
commit 8bd2e6c
Showing 1 changed file with 43 additions and 41 deletions.
diff --git a/lib/index.ts b/lib/index.ts
@@ -95,43 +95,6 @@ export default class VitePressI18n {
     return result;
   }
 
-  private static getDefaultLabelValue(locale: string): string {
-    const findIndex = PLUGIN_SUPPORT_LOCALES.findIndex((x) => x.value === locale);
-    const fallbackLocaleIndex = PLUGIN_SUPPORT_LOCALES.findIndex(
-      (x) => x.value === FALLBACK_LOCALE
-    );
-
-    return findIndex !== -1
-      ? PLUGIN_SUPPORT_LOCALES[findIndex].label
-      : PLUGIN_SUPPORT_LOCALES[fallbackLocaleIndex].label;
-  }
-
-  private static getDefaultLangValue(
-    options: Partial<VitePressI18nLocalesOptions>,
-    label: string,
-    locale: string
-  ): object {
-    if (options.lang?.[label]) {
-      return { lang: options.lang?.[label] };
-    }
-
-    if (options.disableAutoSetLangValue) {
-      return {};
-    }
-
-    const findIndex = PLUGIN_SUPPORT_LOCALES.findIndex((x) => x.value === locale);
-    const fallbackLocaleIndex = PLUGIN_SUPPORT_LOCALES.findIndex(
-      (x) => x.value === FALLBACK_LOCALE
-    );
-
-    return {
-      lang:
-        findIndex !== -1
-          ? PLUGIN_SUPPORT_LOCALES[findIndex].lang
-          : PLUGIN_SUPPORT_LOCALES[fallbackLocaleIndex].lang
-    };
-  }
-
   static generateI18nSearch(
     options: VitePressI18nSearchOptions
   ):
@@ -141,7 +104,7 @@ export default class VitePressI18n {
       throw new Error(`You must pass 1 argument, see the documentation for details.`);
     }
 
-    const result:
+    const tempResult:
       | Record<string, Partial<Omit<LocalSearchOptions, 'locales'>>>
       | Record<string, Partial<DocSearchProps>> = {};
 
@@ -154,17 +117,19 @@ export default class VitePressI18n {
       }
 
       if (options.provider === 'local') {
-        result[label === options.rootLocale ? 'root' : label] = LOCAL_SEARCH_TRANSLATIONS[locale];
+        tempResult[label === options.rootLocale ? 'root' : label] =
+          LOCAL_SEARCH_TRANSLATIONS[locale];
       } else {
-        result[label === options.rootLocale ? 'root' : label] = ALGOLIA_SEARCH_TRANSLATIONS[locale];
+        tempResult[label === options.rootLocale ? 'root' : label] =
+          ALGOLIA_SEARCH_TRANSLATIONS[locale];
       }
     }
 
     const result = {
       provider: options.provider,
       options: {
         ...options.options,
-        locales: result
+        locales: tempResult
       }
     };
 
@@ -178,6 +143,43 @@ export default class VitePressI18n {
 
     return result;
   }
+
+  private static getDefaultLabelValue(locale: string): string {
+    const findIndex = PLUGIN_SUPPORT_LOCALES.findIndex((x) => x.value === locale);
+    const fallbackLocaleIndex = PLUGIN_SUPPORT_LOCALES.findIndex(
+      (x) => x.value === FALLBACK_LOCALE
+    );
+
+    return findIndex !== -1
+      ? PLUGIN_SUPPORT_LOCALES[findIndex].label
+      : PLUGIN_SUPPORT_LOCALES[fallbackLocaleIndex].label;
+  }
+
+  private static getDefaultLangValue(
+    options: Partial<VitePressI18nLocalesOptions>,
+    label: string,
+    locale: string
+  ): object {
+    if (options.lang?.[label]) {
+      return { lang: options.lang?.[label] };
+    }
+
+    if (options.disableAutoSetLangValue) {
+      return {};
+    }
+
+    const findIndex = PLUGIN_SUPPORT_LOCALES.findIndex((x) => x.value === locale);
+    const fallbackLocaleIndex = PLUGIN_SUPPORT_LOCALES.findIndex(
+      (x) => x.value === FALLBACK_LOCALE
+    );
+
+    return {
+      lang:
+        findIndex !== -1
+          ? PLUGIN_SUPPORT_LOCALES[findIndex].lang
+          : PLUGIN_SUPPORT_LOCALES[fallbackLocaleIndex].lang
+    };
+  }
 }
 
 export { VitePressI18n };