refactor: merge I18nRoutingOptions with NuxtI18nOptions (#2724)

nuxt-modules · Jan 22, 2024 · c9bdcd7 · c9bdcd7
1 parent 489f13d
commit c9bdcd7
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 231 deletions.
diff --git a/src/pages.ts b/src/pages.ts
@@ -11,8 +11,7 @@ import { resolve, parse as parsePath } from 'pathe'
 import { NUXT_I18N_COMPOSABLE_DEFINE_ROUTE } from './constants'
 
 import type { Nuxt, NuxtPage } from '@nuxt/schema'
-import type { NuxtI18nOptions, CustomRoutePages } from './types'
-import type { ComputedRouteOptions, RouteOptionsResolver } from './routing'
+import type { NuxtI18nOptions, CustomRoutePages, ComputedRouteOptions, RouteOptionsResolver } from './types'
 import type { Node, ObjectExpression, ArrayExpression } from '@babel/types'
 
 const debug = createDebug('@nuxtjs/i18n:pages')

diff --git a/src/routing.ts b/src/routing.ts
@@ -3,7 +3,7 @@ import { getNormalizedLocales } from './utils'
 import type { Locale } from 'vue-i18n'
 import type { NuxtPage } from '@nuxt/schema'
 import type { MarkRequired, MarkOptional } from 'ts-essentials'
-import type { NuxtI18nOptions } from './types'
+import type { NuxtI18nOptions, PrefixLocalizedRouteOptions, RouteOptionsResolver } from './types'
 
 const join = (...args: (string | undefined)[]) => args.filter(Boolean).join('')
 
@@ -20,36 +20,6 @@ export declare interface ComputedRouteOptions {
   paths: Record<string, string>
 }
 
-/**
- * Resolver for route localizing options
- *
- * @public
- */
-export declare type RouteOptionsResolver = (route: NuxtPage, localeCodes: string[]) => ComputedRouteOptions | undefined
-
-/**
- * Localize route path prefix judgment options used in {@link LocalizeRoutesPrefixable}
- *
- * @public
- */
-export interface PrefixLocalizedRouteOptions {
-  /**
-   * Current locale
-   */
-  locale: Locale
-  /**
-   * Default locale
-   */
-  defaultLocale?: Locale | undefined
-  /**
-   * The parent route of the route to be resolved
-   */
-  parent: NuxtPage | undefined
-  /**
-   * The path of route
-   */
-  path: string
-}
 export function prefixLocalizedRoute(
   localizeOptions: PrefixLocalizedRouteOptions,
   options: LocalizeRoutesParams,

diff --git a/src/runtime/routing/extends/i18n.ts b/src/runtime/routing/extends/i18n.ts
@@ -22,7 +22,7 @@ import type {
   VueI18n,
   VueI18nExtender
 } from 'vue-i18n'
-import type { I18nRoutingOptions, LocaleObject } from '#build/i18n.options.mjs'
+import type { LocaleObject, NuxtI18nOptions } from '#build/i18n.options.mjs'
 
 /**
  * An options of Vue I18n Routing Plugin
@@ -57,7 +57,7 @@ export interface ExtendHooks {
   onExtendVueI18n?: ExtendVueI18nHook
 }
 
-export type VueI18nExtendOptions<Context = unknown> = Pick<I18nRoutingOptions<Context>, 'baseUrl'> & {
+export type VueI18nExtendOptions<Context = unknown> = Pick<NuxtI18nOptions<Context>, 'baseUrl'> & {
   locales?: string[] | LocaleObject[]
   localeCodes?: string[]
   context?: Context