fix: logic to validate the browser version

src/module.ts

@@ -11,24 +11,15 @@ type PredefinedBrowsers =
   | "Opera"
   | "Internet Explorer";
 
-export type BrowsersVersion = {
+export type MinimumBrowsersVersion = {
   [key in PredefinedBrowsers]?: AcceptedValues;
 } & Record<string, AcceptedValues>;
 
 export interface ModuleOptions {
   redirect: string;
-  versions: BrowsersVersion;
+  versions: MinimumBrowsersVersion;
 }
 
-// declare module "nuxt/schema" {
-//   interface RuntimeConfig {
-//     supportedBrowsers?: ModuleOptions;
-//   }
-//   interface PublicRuntimeConfig {
-//     supportedBrowsers: ModuleOptions;
-//   }
-// }
-
 export default defineNuxtModule<ModuleOptions>({
   meta: {
     name: "nuxt-supported-browsers",
@@ -40,7 +31,7 @@ export default defineNuxtModule<ModuleOptions>({
         Firefox: 70,
         Safari: 13,
         Edge: 84,
-        Opera: null,
+        Opera: 60,
         "Internet Explorer": undefined,
       },
     },
@@ -49,10 +40,6 @@ export default defineNuxtModule<ModuleOptions>({
   setup(options, nuxt) {
     const resolver = createResolver(import.meta.url);
 
-    if (!options) {
-      throw new Error("Supported browser module options are required");
-    }
-
     nuxt.options.runtimeConfig.public.supportedBrowsers = defu(
       nuxt.options.runtimeConfig.public.supportedBrowsers,
       options

src/runtime/composable/checkBrowserCompatibility.ts

@@ -1,21 +1,24 @@
-import { BrowsersVersion } from "../../types";
+import { MinimumBrowsersVersion } from "../../module";
 import { BrowserInfo } from "./detectBrowser";
 
 type CheckBrowserCompatibility = {
-  supportedBrowsers: BrowsersVersion;
+  supportedBrowsers: MinimumBrowsersVersion;
   currentBrowser: BrowserInfo;
 };
 
 export function useCheckBrowserCompatibility({
   supportedBrowsers,
   currentBrowser,
 }: CheckBrowserCompatibility): boolean {
-  console.log(supportedBrowsers, currentBrowser);
+  if (currentBrowser.name in supportedBrowsers === false) {
+    return false;
+  }
+
+  const mustSuportVersion = supportedBrowsers[currentBrowser.name];
 
-  // FIX: fix error (Object is possibly 'null' or 'undefined')
   return (
-    currentBrowser.name in supportedBrowsers &&
-    currentBrowser.version >= supportedBrowsers[currentBrowser.name] &&
-    Number.isFinite(supportedBrowsers[currentBrowser.name])
+    typeof mustSuportVersion === "number" &&
+    Number.isFinite(mustSuportVersion) &&
+    currentBrowser.version >= mustSuportVersion
   );
 }

src/runtime/middleware/supported-browsers.ts

@@ -1,29 +1,29 @@
 import { defineNuxtRouteMiddleware, navigateTo, useRuntimeConfig } from "#app";
 import { useDetectBrowser } from "../composable/detectBrowser";
+import { useCheckBrowserCompatibility } from "../composable/checkBrowserCompatibility";
 
 export default defineNuxtRouteMiddleware((to) => {
   if (process.server) return;
 
-  const { supportedBrowser } = useRuntimeConfig().public;
+  const {
+    supportedBrowsers: { versions, redirect },
+  } = useRuntimeConfig().public;
 
-  if (!supportedBrowser) {
+  if (!versions || !redirect) {
     console.warn(
       "[Nuxt Supported browsers]: module options are required, module is disabled"
     );
     return;
   }
 
-  const browsersVersion = supportedBrowser.versions;
-  const redirect = supportedBrowser.redirect;
-
   const isUnsuportedPage: boolean = to.path === redirect;
 
   const { name, version } = useDetectBrowser(navigator.userAgent);
 
-  const isSupportedBrowser: boolean =
-    name in browsersVersion &&
-    version >= browsersVersion[name] &&
-    Number.isFinite(browsersVersion[name]);
+  const isSupportedBrowser = useCheckBrowserCompatibility({
+    supportedBrowsers: versions,
+    currentBrowser: { name, version },
+  });
 
   if (!isSupportedBrowser && !isUnsuportedPage) {
     return navigateTo(redirect, {