nuxt-typed-router 2.3.0 → 2.3.2

package/README.md

@@ -94,7 +94,7 @@ export default defineNuxtConfig({
 - [ ] Add `path` autocomplete with TS string templates
 - [ ] Enforce strong params typing depending of origin route
 - [ ] Add support for `validate` in `definePageMeta`
-- [ ] Add `strict` option to prevent path navigation
+- [x] Add `strict` option to prevent path navigation
 
 
 ## Development

package/dist/module.json

@@ -5,5 +5,5 @@
     "nuxt": "^3.0.0",
     "bridge": false
   },
-  "version": "2.3.0"
+  "version": "2.3.2"
 }

package/dist/module.mjs

@@ -238,7 +238,8 @@ function createTypedRouterFile() {
       strictOptions.router.strictRouteLocation,
       `| Omit<RouteLocationPathRaw, 'path'>`,
       "| RouteLocationPathRaw"
-    )};
+    )}
+  ;
   
 
   /**
@@ -362,7 +363,7 @@ function createTypedRouterDefinitionFile() {
     import type { NuxtLinkProps } from '#app';
     import type { DefineComponent } from 'vue';
     import type { RouteLocationRaw, RouteLocationPathRaw } from 'vue-router';
-    import type { RoutesNamedLocations, RoutesNamesListRecord } from './__routes';
+    import type { RoutesNamesList, RoutesNamedLocations, RoutesNamesListRecord } from './__routes';
     import type {TypedRouter, TypedRoute} from './__router';
     import { useRoute as _useRoute } from './__useTypedRoute';
     import { useRouter as _useRouter } from './__useTypedRouter';
@@ -627,12 +628,15 @@ function createi18nRouterFile() {
     `
 
   import { useLocalePath as _useLocalePath, useLocaleRoute as _useLocaleRoute} from 'vue-i18n-routing';
-  import type {TypedRouteLocationRawFromName, TypedRouteFromName} from './__router';
+  import type {TypedRouteLocationRawFromName, TypedRouteFromName, TypedLocationAsRelativeRaw} from './__router';
   import type {RoutesNamesList} from './__routes';
 
   export type I18nLocales = ${i18nLocales.length ? i18nLocales.map((loc) => `"${loc}"`).join("|") : "string"};
 
-  export type TypedToLocalePath = <T extends RoutesNamesList>(to: TypedRouteLocationRawFromName<T>, locale?: I18nLocales | undefined) => TypedRouteLocationRawFromName<T>;
+  export type TypedToLocalePath = <T extends RoutesNamesList>(
+    to: TypedRouteLocationRawFromName<T>,
+    locale?: I18nLocales | undefined
+  ) => Required<TypedLocationAsRelativeRaw<T>>;
 
   export function useLocalePath(options?: Pick<NonNullable<Parameters<typeof _useLocalePath>[0]>, 'i18n'>): TypedToLocalePath {
      return _useLocalePath(options) as any;
@@ -1035,11 +1039,27 @@ const module = defineNuxtModule({
   setup(moduleOptions, nuxt) {
     const { resolve } = createResolver(import.meta.url);
     const rootDir = nuxt.options.rootDir;
-    const hasi18nModuleRegistered = !!nuxt.options.modules.find((mod) => mod === "@nuxtjs/i18n");
+    let i18nLocales = [];
+    const hasi18nModuleRegistered = nuxt.options.modules.some((mod) => {
+      if (Array.isArray(mod)) {
+        const [moduleName, options] = mod;
+        const isRegistered = moduleName === "@nuxtjs/i18n";
+        if (isRegistered) {
+          i18nLocales = options?.locales ?? [];
+        }
+        return isRegistered;
+      } else {
+        const isRegistered = mod === "@nuxtjs/i18n";
+        if (isRegistered) {
+          i18nLocales = nuxt.options.i18n?.locales ?? [];
+        }
+        return isRegistered;
+      }
+    });
     moduleOptionStore.updateOptions({
       ...moduleOptions,
       i18n: hasi18nModuleRegistered,
-      i18nLocales: nuxt.options?.i18n?.locales ?? []
+      i18nLocales
     });
     nuxt.options.alias = {
       ...nuxt.options.alias,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-typed-router",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "Provide autocompletion for pages route names generated by Nuxt router",
   "type": "module",
   "main": "./dist/module.cjs",