litestar-vite-plugin 0.6.4 → 0.6.6

package/inertia-helpers/index.js

@@ -63,6 +63,9 @@ export function getRelativeUrlPath(url) {
         return url;
     }
 }
+function routePatternToRegex(pattern) {
+    return new RegExp('^' + pattern.replace(/\*/g, '.*') + '$');
+}
 export function toRoute(url) {
     url = getRelativeUrlPath(url);
     url = url === '/' ? url : url.replace(/\/$/, '');
@@ -94,27 +97,28 @@ export function currentRoute() {
 export function isRoute(url, routeName) {
     url = getRelativeUrlPath(url);
     url = url === '/' ? url : url.replace(/\/$/, '');
-    try {
-        const routePattern = routes[routeName];
-        const regexPattern = routePattern.replace(/\//g, '\\/').replace(/\{([^}]+):([^}]+)\}/g, (match, paramName, paramType) => {
-            // Create a regex pattern based on the parameter type
-            switch (paramType) {
-                case 'str':
-                case 'path':
-                    return '([^/]+)'; // Match any non-slash characters
-                case 'uuid':
-                    return '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'; // Match a UUID pattern
-                default:
-                    return '([^/]+)'; // Default to match any non-slash characters
+    const routeNameRegex = routePatternToRegex(routeName);
+    for (const routeName in routes) {
+        if (routeNameRegex.test(routeName)) {
+            const routePattern = routes[routeName];
+            const regexPattern = routePattern.replace(/\//g, '\\/').replace(/\{([^}]+):([^}]+)\}/g, (match, paramName, paramType) => {
+                switch (paramType) {
+                    case 'str':
+                    case 'path':
+                        return '([^/]+)';
+                    case 'uuid':
+                        return '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
+                    default:
+                        return '([^/]+)';
+                }
+            });
+            const regex = new RegExp(`^${regexPattern}$`);
+            if (regex.test(url)) {
+                return true;
             }
-        });
-        const regex = new RegExp(`^${regexPattern}$`);
-        return regex.test(url);
-    }
-    catch (error) {
-        console.error(error);
-        return false;
+        }
     }
+    return false;
 }
 export function isCurrentRoute(routeName) {
     const currentRouteName = currentRoute();
@@ -122,7 +126,8 @@ export function isCurrentRoute(routeName) {
         console.error("Could not match current window location to a named route.");
         return false;
     }
-    return currentRouteName == routeName;
+    const routeNameRegex = routePatternToRegex(routeName);
+    return routeNameRegex.test(currentRouteName);
 }
 globalThis.routes = globalThis.routes || {};
 globalThis.route = route;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "litestar-vite-plugin",
-    "version": "0.6.4",
+    "version": "0.6.6",
     "type": "module",
     "description": "Litestar plugin for Vite.",
     "keywords": [