litestar-vite-plugin 0.6.3 → 0.6.5

package/inertia-helpers/index.d.ts

@@ -1,5 +1,6 @@
 export declare function resolvePageComponent<T>(path: string | string[], pages: Record<string, Promise<T> | (() => Promise<T>)>): Promise<T>;
 export declare function route(routeName: string, ...args: any[]): string;
+export declare function getRelativeUrlPath(url: string): string;
 export declare function toRoute(url: string): string | null;
 export declare function currentRoute(): string | null;
 export declare function isRoute(url: string, routeName: string): boolean;

package/inertia-helpers/index.js

@@ -15,7 +15,7 @@ export function route(routeName, ...args) {
         console.error(`URL '${routeName}' not found in routes.`);
         return "#"; // Return "#" to indicate failure
     }
-    const argTokens = url.match(/{(\w+:?)?\w+}/g);
+    const argTokens = url.match(/\{([^}]+):([^}]+)\}/g);
     if (!argTokens && args.length > 0) {
         console.error(`Invalid URL lookup: URL '${routeName}' does not expect arguments.`);
         return "#";
@@ -53,11 +53,22 @@ export function route(routeName, ...args) {
     }
     return url;
 }
+export function getRelativeUrlPath(url) {
+    try {
+        const urlObject = new URL(url);
+        return urlObject.pathname + urlObject.search + urlObject.hash;
+    }
+    catch (e) {
+        // If the URL is invalid or already a relative path, just return it as is
+        return url;
+    }
+}
 export function toRoute(url) {
+    url = getRelativeUrlPath(url);
+    url = url === '/' ? url : url.replace(/\/$/, '');
     for (const routeName in routes) {
         const routePattern = routes[routeName];
-        const regexPattern = routePattern
-            .replace(/{\w+:(\w+)}/g, (match, paramName, paramType) => {
+        const regexPattern = routePattern.replace(/\//g, '\\/').replace(/\{([^}]+):([^}]+)\}/g, (match, paramName, paramType) => {
             // Create a regex pattern based on the parameter type
             switch (paramType) {
                 case 'str':
@@ -68,9 +79,8 @@ export function toRoute(url) {
                 default:
                     return '([^/]+)'; // Default to match any non-slash characters
             }
-        })
-            .replace(/\//g, '\\/'); // Escape slashes for regex
-        const regex = new RegExp('^' + regexPattern);
+        });
+        const regex = new RegExp(`^${regexPattern}$`);
         if (regex.test(url)) {
             return routeName;
         }
@@ -82,29 +92,30 @@ export function currentRoute() {
     return toRoute(currentUrl);
 }
 export function isRoute(url, routeName) {
-    try {
-        const routePattern = routes[routeName];
-        const regexPattern = routePattern
-            .replace(/{\w+:(\w+)}/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
+    url = getRelativeUrlPath(url);
+    url = url === '/' ? url : url.replace(/\/$/, '');
+    const routeNameRegex = new RegExp('^' + routeName.replace(/\*/g, '.*') + '$');
+    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;
             }
-        })
-            .replace(/\//g, '\\/'); // Escape slashes for regex
-        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();
@@ -112,7 +123,8 @@ export function isCurrentRoute(routeName) {
         console.error("Could not match current window location to a named route.");
         return false;
     }
-    return currentRouteName == routeName;
+    const routeNameRegex = new RegExp('^' + routeName.replace(/\*/g, '.*') + '$');
+    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.3",
+    "version": "0.6.5",
     "type": "module",
     "description": "Litestar plugin for Vite.",
     "keywords": [