feat(pluralization): enhance handling of empty and undefined forms

Author: s00d

playground/nuxt.config.ts

@@ -87,7 +87,10 @@ export default defineNuxtConfig({
         return null
       }
       const forms = translation.toString().split('|')
-      return (count < forms.length ? forms[count].trim() : forms[forms.length - 1].trim()).replace('{count}', count.toString())
+      if (forms.length === 0) return null
+      const selectedForm = count < forms.length ? forms[count] : forms[forms.length - 1]
+      if (!selectedForm) return null
+      return selectedForm.trim().replace('{count}', count.toString())
     },
   },
 })

playground/pages/page.vue

@@ -143,11 +143,18 @@ const customPluralRule = (key: string, count: number, params: Params, _locale: s
   }
   const forms = translation.toString().split('|')
   if (count === 0 && forms.length > 2) {
-    return forms[0].trim() // Case for "no apples"
+    const form = forms[0]
+    return form ? form.trim() : null // Case for "no apples"
   }
   if (count === 1 && forms.length > 1) {
-    return forms[1].trim() // Case for "one apple"
+    const form = forms[1]
+    return form ? form.trim() : null // Case for "one apple"
   }
-  return (forms.length > 2 ? forms[2].trim() : forms[forms.length - 1].trim()).replace('{count}', count.toString())
+  if (forms.length > 2) {
+    const form = forms[2]
+    return form ? form.trim().replace('{count}', count.toString()) : null
+  }
+  const lastForm = forms[forms.length - 1]
+  return lastForm ? lastForm.trim().replace('{count}', count.toString()) : null
 }
 </script>

src/module.ts

@@ -100,7 +100,10 @@ export default defineNuxtModule<ModuleOptions>({
         return null
       }
       const forms = translation.toString().split('|')
-      return (count < forms.length ? forms[count].trim() : forms[forms.length - 1].trim()).replace('{count}', count.toString())
+      if (forms.length === 0) return null
+      const selectedForm = count < forms.length ? forms[count] : forms[forms.length - 1]
+      if (!selectedForm) return null
+      return selectedForm.trim().replace('{count}', count.toString())
     },
     customRegexMatcher: undefined,
   },
@@ -284,7 +287,9 @@ export default defineNuxtModule<ModuleOptions>({
         pages.push(fallbackRoute)
       }
       if (!isNoPrefixStrategy(options.strategy!)) {
-        nuxt.options.generate.routes = Array.isArray(nuxt.options.generate.routes) ? nuxt.options.generate.routes : []
+        // @ts-ignore - generate может не существовать в новых версиях Nuxt
+        ;(nuxt.options as any).generate = (nuxt.options as any).generate || {}
+        ;(nuxt.options as any).generate.routes = Array.isArray((nuxt.options as any).generate.routes) ? (nuxt.options as any).generate.routes : []
 
         if (isCloudflarePages) {
           const processPageWithChildren = (page: NuxtPage, parentPath = '') => {
@@ -307,7 +312,7 @@ export default defineNuxtModule<ModuleOptions>({
             // Проверяем наличие динамического сегмента :locale
             const localeSegmentMatch = fullPath.match(/:locale\(([^)]+)\)/)
 
-            if (localeSegmentMatch) {
+            if (localeSegmentMatch && localeSegmentMatch[1]) {
               const availableLocales = localeSegmentMatch[1].split('|') // Достаем локали из сегмента, например "de|ru|en"
               localeManager.locales.forEach((locale) => {
                 const localeCode = locale.code
@@ -347,7 +352,7 @@ export default defineNuxtModule<ModuleOptions>({
           }
 
           // Пройдемся по страницам и добавим пути для каждого локализованного пути
-          pages.forEach((page) => {
+          pages.forEach((page: NuxtPage) => {
             processPageWithChildren(page) // Обрабатываем каждую страницу рекурсивно
           })
         }
@@ -427,15 +432,17 @@ export default defineNuxtModule<ModuleOptions>({
 
       const routes = nitroConfig.prerender?.routes || []
 
-      nuxt.options.generate.routes = Array.isArray(nuxt.options.generate.routes) ? nuxt.options.generate.routes : []
-      const pages = nuxt.options.generate.routes || []
+      // @ts-ignore - generate может не существовать в новых версиях Nuxt
+      ;(nuxt.options as any).generate = (nuxt.options as any).generate || {}
+      ;(nuxt.options as any).generate.routes = Array.isArray((nuxt.options as any).generate.routes) ? (nuxt.options as any).generate.routes : []
+      const pages = (nuxt.options as any).generate.routes || []
 
       localeManager.locales.forEach((locale) => {
         // Для стратегий prefix и prefix_and_default генерируем маршруты и для defaultLocale
         // Для стратегии prefix_except_default пропускаем defaultLocale
         const shouldGenerate = locale.code !== defaultLocale || withPrefixStrategy(options.strategy!)
         if (shouldGenerate) {
-          pages.forEach((page) => {
+          pages.forEach((page: string) => {
             // Пропускаем файлоподобные пути и служебные сегменты `__*`
             if (!/\.[a-z0-9]+$/i.test(page) && !isInternalPath(page)) {
               const localizedPage = `/${locale.code}${page}`

src/page-manager.ts

@@ -93,6 +93,7 @@ export class PageManager {
       // remove default routes
       for (let i = pages.length - 1; i >= 0; i--) {
         const page = pages[i]
+        if (!page) continue
         const pagePath = page.path ?? ''
         const pageName = page.name ?? ''
 
@@ -437,7 +438,10 @@ export class PageManager {
   ): NuxtPage | null {
     const routePath = this.buildRoutePath(localeCodes, page.path, encodeURI(customPath), isCustom, customRegex, force)
     if (!routePath || routePath == page.path) return null
-    const routeName = buildRouteName(buildRouteNameFromRoute(page.name, page.path), localeCodes[0], isCustom)
+    if (localeCodes.length === 0) return null
+    const firstLocale = localeCodes[0]
+    if (!firstLocale) return null
+    const routeName = buildRouteName(buildRouteNameFromRoute(page.name ?? '', page.path ?? ''), firstLocale, isCustom)
 
     return {
       ...page,

src/runtime/plugins/01.plugin.ts

@@ -54,8 +54,11 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     try {
       if (!i18nHelper.hasPageTranslation(locale, routeName)) {
         let fRouteName = routeName
-        if (i18nConfig.routesLocaleLinks && i18nConfig.routesLocaleLinks[fRouteName]) {
-          fRouteName = i18nConfig.routesLocaleLinks[fRouteName]
+        if (i18nConfig.routesLocaleLinks && fRouteName && i18nConfig.routesLocaleLinks[fRouteName]) {
+          const newRouteName = i18nConfig.routesLocaleLinks[fRouteName]
+          if (newRouteName) {
+            fRouteName = newRouteName
+          }
         }
 
         if (!fRouteName || fRouteName === '') {
@@ -167,6 +170,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       const currentLocale = routeService.getCurrentLocale()
       const { count, ..._params } = typeof params === 'number' ? { count: params } : params
 
+      if (count === undefined) return defaultValue ?? key
       return plural(key, Number.parseInt(count.toString()), _params, currentLocale, provideData.t) as string ?? defaultValue ?? key
     },
     tn: (value: number, options?: Intl.NumberFormatOptions) => {

src/runtime/plugins/04.auto-detect.ts

@@ -5,7 +5,10 @@ import { defineNuxtPlugin, useCookie, useRequestHeaders, navigateTo, useRoute, u
 const parseAcceptLanguage = (acceptLanguage: string) =>
   acceptLanguage
     .split(',')
-    .map(entry => entry.split(';')[0].trim())
+    .map((entry) => {
+      const parts = entry.split(';')
+      return parts[0] ? parts[0].trim() : ''
+    })
 
 export default defineNuxtPlugin(async (nuxtApp) => {
   const i18nConfig = nuxtApp.$config.public.i18nConfig as unknown as ModuleOptionsExtend