@cloudwerk/vite-plugin 0.1.1 → 0.1.2

package/dist/index.js

@@ -43,7 +43,7 @@ function generateServerEntry(manifest, scanResult, options) {
     for (const middlewarePath of route.middleware) {
       if (!importedModules.has(middlewarePath)) {
         const varName = `middleware_${middlewareIndex++}`;
-        middlewareImports.push(`import ${varName} from '${middlewarePath}'`);
+        middlewareImports.push(`import { middleware as ${varName} } from '${middlewarePath}'`);
         middlewareModules.set(middlewarePath, varName);
         importedModules.add(middlewarePath);
       }
@@ -63,6 +63,13 @@ function generateServerEntry(manifest, scanResult, options) {
       imports.push(`import * as ${varName} from '${route.absolutePath}'`);
       const layoutChain = route.layouts.map((p) => layoutModules.get(p)).join(", ");
       const middlewareChain = route.middleware.map((p) => middlewareModules.get(p)).join(", ");
+      const hasOptionalCatchAll = route.segments.some((s) => s.type === "optionalCatchAll");
+      if (hasOptionalCatchAll) {
+        const basePath = route.urlPattern.replace(/\/:[^/]+\{\.\*\}$/, "") || "/";
+        pageRegistrations.push(
+          `  registerPage(app, '${basePath}', ${varName}, [${layoutChain}], [${middlewareChain}])`
+        );
+      }
       pageRegistrations.push(
         `  registerPage(app, '${route.urlPattern}', ${varName}, [${layoutChain}], [${middlewareChain}])`
       );
@@ -82,7 +89,7 @@ function generateServerEntry(manifest, scanResult, options) {
  */
 
 import { Hono } from 'hono'
-import { contextMiddleware, createHandlerAdapter, setRouteConfig } from '@cloudwerk/core/runtime'
+import { contextMiddleware, createHandlerAdapter, createMiddlewareAdapter, setRouteConfig } from '@cloudwerk/core/runtime'
 import { setActiveRenderer } from '@cloudwerk/ui'
 
 // Page and Route Imports
@@ -101,9 +108,9 @@ ${middlewareImports.join("\n")}
 const HTTP_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS', 'HEAD']
 
 function registerPage(app, pattern, pageModule, layoutModules, middlewareModules) {
-  // Apply middleware
+  // Apply middleware (wrap with adapter to convert Cloudwerk middleware to Hono middleware)
   for (const mw of middlewareModules) {
-    app.use(pattern, mw)
+    app.use(pattern, createMiddlewareAdapter(mw))
   }
 
   // Apply config middleware if present
@@ -184,9 +191,9 @@ function renderWithHydration(element) {
 }
 
 function registerRoute(app, pattern, routeModule, middlewareModules) {
-  // Apply middleware
+  // Apply middleware (wrap with adapter to convert Cloudwerk middleware to Hono middleware)
   for (const mw of middlewareModules) {
-    app.use(pattern, mw)
+    app.use(pattern, createMiddlewareAdapter(mw))
   }
 
   // Apply config middleware if present

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudwerk/vite-plugin",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Vite plugin for Cloudwerk file-based routing with virtual entry generation",
   "repository": {
     "type": "git",
@@ -19,8 +19,8 @@
   ],
   "dependencies": {
     "@swc/core": "^1.3.100",
-    "@cloudwerk/core": "^0.7.0",
-    "@cloudwerk/ui": "^0.7.0"
+    "@cloudwerk/core": "^0.7.1",
+    "@cloudwerk/ui": "^0.7.1"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0",