@jay-framework/dev-server 0.16.0 → 0.16.2

package/dist/index.d.ts

@@ -220,10 +220,20 @@ interface ActionRouterOptions {
  */
 declare function createActionRouter(options?: ActionRouterOptions): RequestHandler$1;
 /**
- * Express middleware to parse JSON body for action requests.
+ * Options for the action body parser middleware.
+ */
+interface ActionBodyParserOptions {
+    /** Build folder for temp file storage (DL#131) */
+    buildFolder: string;
+    /** Action registry to check for acceptsFiles (default: global actionRegistry) */
+    registry?: ActionRegistry;
+}
+/**
+ * Express middleware to parse request body for action requests.
+ * Supports JSON (default) and multipart/form-data (for actions with .withFiles()).
  * Should be applied before the action router.
  */
-declare function actionBodyParser(): RequestHandler$1;
+declare function actionBodyParser(options: ActionBodyParserOptions): RequestHandler$1;
 
 /**
  * Vite Factory
@@ -267,4 +277,4 @@ declare function createViteForCli(options: {
     tsConfigFilePath?: string;
 }): Promise<ViteDevServer>;
 
-export { ACTION_ENDPOINT_BASE, type ActionRouterOptions, type CreateViteServerOptions, DEV_SERVER_SERVICE, type DevServer, type DevServerOptions, type DevServerRoute, DevServerService, type FreezeEntry, FreezeStore, type RouteInfo, actionBodyParser, createActionRouter, createViteForCli, createViteServer, mkDevServer };
+export { ACTION_ENDPOINT_BASE, type ActionBodyParserOptions, type ActionRouterOptions, type CreateViteServerOptions, DEV_SERVER_SERVICE, type DevServer, type DevServerOptions, type DevServerRoute, DevServerService, type FreezeEntry, FreezeStore, type RouteInfo, actionBodyParser, createActionRouter, createViteForCli, createViteServer, mkDevServer };

package/dist/index.js

@@ -20,6 +20,10 @@ import { discoverPluginsWithInit, sortPluginsByDependencies, executePluginServer
 import * as fs$1 from "node:fs/promises";
 import fs__default from "node:fs/promises";
 import { pathToFileURL } from "node:url";
+import Busboy from "busboy";
+import fs$2 from "fs";
+import path$1 from "path";
+import crypto from "crypto";
 import { randomUUID } from "node:crypto";
 import { createJayService } from "@jay-framework/fullstack-component";
 const s$1 = createRequire(import.meta.url), e$1 = s$1("typescript"), c$1 = new Proxy(e$1, {
@@ -915,6 +919,7 @@ function extractActionFromExpression(node) {
   let current = node;
   let method = "POST";
   let explicitMethod = null;
+  let acceptsFiles = false;
   while (c$1.isCallExpression(current)) {
     const expr = current.expression;
     if (c$1.isPropertyAccessExpression(expr) && expr.name.text === "withMethod") {
@@ -925,6 +930,11 @@ function extractActionFromExpression(node) {
       current = expr.expression;
       continue;
     }
+    if (c$1.isPropertyAccessExpression(expr) && expr.name.text === "withFiles") {
+      acceptsFiles = true;
+      current = expr.expression;
+      continue;
+    }
     if (c$1.isPropertyAccessExpression(expr) && ["withServices", "withCaching", "withHandler", "withTimeout"].includes(expr.name.text)) {
       current = expr.expression;
       continue;
@@ -938,7 +948,8 @@ function extractActionFromExpression(node) {
             return {
               actionName: nameArg.text,
               method: "POST",
-              isStreaming: true
+              isStreaming: true,
+              ...acceptsFiles && { acceptsFiles: true }
             };
           }
           method = funcName === "makeJayQuery" ? "GET" : "POST";
@@ -947,7 +958,8 @@ function extractActionFromExpression(node) {
           }
           return {
             actionName: nameArg.text,
-            method
+            method,
+            ...acceptsFiles && { acceptsFiles: true }
           };
         }
       }
@@ -1354,13 +1366,14 @@ function jayStackCompiler(options = {}) {
             ""
           ];
           for (const action of actions) {
+            const filesOpt = action.acceptsFiles ? ", { acceptsFiles: true }" : "";
             if (action.isStreaming) {
               lines.push(
-                `export const ${action.exportName} = createStreamCaller('${action.actionName}');`
+                `export const ${action.exportName} = createStreamCaller('${action.actionName}'${filesOpt});`
               );
             } else {
               lines.push(
-                `export const ${action.exportName} = createActionCaller('${action.actionName}', '${action.method}');`
+                `export const ${action.exportName} = createActionCaller('${action.actionName}', '${action.method}'${filesOpt});`
               );
             }
           }
@@ -1782,6 +1795,11 @@ function createActionRouter(options) {
       requestMethod,
       ACTION_ENDPOINT_BASE + "/" + actionName
     );
+    const tempDir = req._jayTempDir;
+    const cleanup = () => {
+      if (tempDir)
+        cleanupTempDir(tempDir);
+    };
     if (registry.isStreaming(actionName)) {
       res.setHeader("Content-Type", "application/x-ndjson");
       res.setHeader("Transfer-Encoding", "chunked");
@@ -1794,11 +1812,13 @@ function createActionRouter(options) {
       } catch (err) {
         res.write(JSON.stringify({ error: err.message }) + "\n");
       }
+      cleanup();
       res.end();
       timing?.end();
       return;
     }
     const result = await registry.execute(actionName, input);
+    cleanup();
     if (requestMethod === "GET" && result.success) {
       const cacheHeaders = registry.getCacheHeaders(actionName);
       if (cacheHeaders) {
@@ -1839,7 +1859,106 @@ function getStatusCodeForError(code, isActionError) {
       return 500;
   }
 }
-function actionBodyParser() {
+const DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024;
+const DEFAULT_MAX_FILES = 10;
+function parseMultipart(req, tempDir, maxFileSize, maxFiles) {
+  return new Promise((resolve, reject) => {
+    fs$2.mkdirSync(tempDir, { recursive: true });
+    const files = {};
+    let jsonData = {};
+    let fileCount = 0;
+    let errored = false;
+    const pendingWrites = [];
+    const bb = Busboy({
+      headers: req.headers,
+      limits: {
+        fileSize: maxFileSize,
+        files: maxFiles
+      }
+    });
+    bb.on("file", (fieldname, stream, info) => {
+      if (errored)
+        return;
+      fileCount++;
+      const filename = info.filename || `upload-${fileCount}`;
+      const tempPath = path$1.join(tempDir, `${fileCount}-${filename}`);
+      let size = 0;
+      let truncated = false;
+      const writeStream = fs$2.createWriteStream(tempPath);
+      stream.pipe(writeStream);
+      stream.on("data", (data) => {
+        size += data.length;
+      });
+      stream.on("limit", () => {
+        truncated = true;
+      });
+      pendingWrites.push(
+        new Promise((resolveWrite, rejectWrite) => {
+          writeStream.on("close", () => {
+            if (truncated) {
+              rejectWrite(
+                new Error(
+                  `File "${filename}" exceeds maximum size of ${maxFileSize} bytes`
+                )
+              );
+              return;
+            }
+            const jayFile = {
+              name: filename,
+              type: info.mimeType,
+              size,
+              path: tempPath
+            };
+            if (files[fieldname]) {
+              const existing = files[fieldname];
+              if (Array.isArray(existing)) {
+                existing.push(jayFile);
+              } else {
+                files[fieldname] = [existing, jayFile];
+              }
+            } else {
+              files[fieldname] = jayFile;
+            }
+            resolveWrite();
+          });
+        })
+      );
+    });
+    bb.on("field", (fieldname, value) => {
+      if (errored)
+        return;
+      if (fieldname === "_json") {
+        try {
+          jsonData = JSON.parse(value);
+        } catch {
+          errored = true;
+          reject(new Error("Invalid JSON in _json field"));
+        }
+      }
+    });
+    bb.on("close", () => {
+      if (errored)
+        return;
+      Promise.all(pendingWrites).then(() => resolve({ body: { ...jsonData, ...files }, tempDir })).catch((err) => reject(err));
+    });
+    bb.on("error", (err) => {
+      if (!errored) {
+        errored = true;
+        reject(err);
+      }
+    });
+    req.pipe(bb);
+  });
+}
+function cleanupTempDir(dir) {
+  try {
+    fs$2.rmSync(dir, { recursive: true, force: true });
+  } catch {
+  }
+}
+function actionBodyParser(options) {
+  const { buildFolder, registry: reg } = options;
+  const registryToUse = reg ?? actionRegistry;
   return (req, res, next) => {
     if (!req.path.startsWith(ACTION_ENDPOINT_BASE)) {
       next();
@@ -1849,6 +1968,42 @@ function actionBodyParser() {
       next();
       return;
     }
+    const contentType = req.headers["content-type"] || "";
+    if (contentType.startsWith("multipart/form-data")) {
+      const actionName = req.path.slice(ACTION_ENDPOINT_BASE.length + 1);
+      const action = registryToUse.get(actionName);
+      if (!action?.acceptsFiles) {
+        res.status(400).json({
+          success: false,
+          error: {
+            code: "FILES_NOT_ACCEPTED",
+            message: `Action '${actionName}' does not accept file uploads. Use .withFiles() on the action builder.`,
+            isActionError: false
+          }
+        });
+        return;
+      }
+      const requestId = crypto.randomUUID();
+      const tempDir = path$1.join(buildFolder, ".tmp", "actions", requestId);
+      const maxFileSize = action.fileOptions?.maxFileSize ?? DEFAULT_MAX_FILE_SIZE;
+      const maxFiles = action.fileOptions?.maxFiles ?? DEFAULT_MAX_FILES;
+      parseMultipart(req, tempDir, maxFileSize, maxFiles).then(({ body: body2, tempDir: td }) => {
+        req.body = body2;
+        req._jayTempDir = td;
+        next();
+      }).catch((err) => {
+        cleanupTempDir(tempDir);
+        res.status(400).json({
+          success: false,
+          error: {
+            code: "MULTIPART_PARSE_ERROR",
+            message: err.message,
+            isActionError: false
+          }
+        });
+      });
+      return;
+    }
     let body = "";
     req.setEncoding("utf8");
     req.on("data", (chunk) => {
@@ -2018,8 +2173,10 @@ async function scanPluginRoutes(projectRoot, projectRoutes) {
         );
         continue;
       }
-      const compPath = route.component.startsWith(".") ? path__default.resolve(plugin.pluginPath, route.component) : resolvePluginModule(plugin);
-      pluginRoutes.push(createRoute(route.path, jayHtmlPath, compPath));
+      const isLocalComponent = route.component.startsWith(".");
+      const compPath = isLocalComponent ? path__default.resolve(plugin.pluginPath, route.component) : resolvePluginModule(plugin);
+      const componentExport = isLocalComponent ? void 0 : route.component;
+      pluginRoutes.push(createRoute(route.path, jayHtmlPath, compPath, componentExport));
       getLogger().info(`[Routes] Plugin "${plugin.name}" provides route ${route.path}`);
     }
   }
@@ -2184,7 +2341,11 @@ function mkRoute(route, vite, slowlyPhase, options, slowRenderCache, freezeStore
           query
         );
       } else {
-        const cachedEntry = await slowRenderCache.get(route.jayHtmlPath, pageParams);
+        const cachedEntry = await slowRenderCache.get(
+          route.jayHtmlPath,
+          pageParams,
+          getRouteDir(route)
+        );
         if (cachedEntry) {
           await handleCachedRequest(
             vite,
@@ -2300,6 +2461,7 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     pluginsForPage,
     options,
     routeToExpressRoute(route),
+    getRouteDir(route),
     cachedEntry.slowViewState,
     timing,
     cachedEntry.preRenderedContent,
@@ -2374,7 +2536,8 @@ async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRen
     pageParams,
     preRenderResult.preRenderedJayHtml,
     renderedSlowly.rendered,
-    carryForward
+    carryForward,
+    getRouteDir(route)
   );
   getLogger().info(`[SlowRender] Cached pre-rendered jay-html at ${cachedEntry.preRenderedPath}`);
   await handleCachedRequest(
@@ -2495,9 +2658,8 @@ async function handleClientOnlyRequest(vite, route, options, slowlyPhase, pagePa
   res.status(200).set({ "Content-Type": "text/html" }).send(compiledPageHtml);
   timing?.end();
 }
-async function sendResponse(vite, res, url, jayHtmlPath, sourceJayHtmlPath, pageParts, viewState, carryForward, clientTrackByMap, projectInit, pluginsForPage, options, routePattern, slowViewState, timing, preLoadedContent, headTags) {
+async function sendResponse(vite, res, url, jayHtmlPath, sourceJayHtmlPath, pageParts, viewState, carryForward, clientTrackByMap, projectInit, pluginsForPage, options, routePattern, routeDir, slowViewState, timing, preLoadedContent, headTags) {
   let pageHtml;
-  const routeDir = path__default.dirname(path__default.relative(options.pagesRootFolder, sourceJayHtmlPath));
   try {
     let jayHtmlContent = preLoadedContent ?? await fs__default.readFile(jayHtmlPath, "utf-8");
     const jayHtmlFilename = path__default.basename(jayHtmlPath);
@@ -2571,13 +2733,13 @@ async function handleFrozenRequest(vite, route, options, freezeStore, slowRender
   const label = entry.name ? `"${entry.name}" (${freezeId})` : freezeId;
   getLogger().info(`[Freeze] Serving frozen page ${label} for ${route.rawRoute} [${format}]`);
   try {
-    const cachedEntry = await slowRenderCache.get(route.jayHtmlPath, pageParams);
+    const routeDir = getRouteDir(route);
+    const cachedEntry = await slowRenderCache.get(route.jayHtmlPath, pageParams, routeDir);
     const jayHtmlPath = cachedEntry?.preRenderedPath ?? route.jayHtmlPath;
     const jayHtmlContent = cachedEntry?.preRenderedContent ?? await fs__default.readFile(jayHtmlPath, "utf-8");
     const jayHtmlFilename = path__default.basename(jayHtmlPath);
     const jayHtmlDir = path__default.dirname(jayHtmlPath);
     const sourceDir = path__default.dirname(route.jayHtmlPath);
-    const routeDir = path__default.dirname(path__default.relative(options.pagesRootFolder, route.jayHtmlPath));
     const { injectHeadfullFSTemplates: injectHeadfullFSTemplates2 } = await import("@jay-framework/compiler-jay-html");
     const { JAY_IMPORT_RESOLVER: JAY_IMPORT_RESOLVER2 } = await import("@jay-framework/compiler-jay-html");
     const fullJayHtml = injectHeadfullFSTemplates2(
@@ -2782,7 +2944,7 @@ async function mkDevServer(rawOptions) {
   await lifecycleManager.initialize();
   await materializeDynamicContracts(projectRootFolder, vite);
   setupServiceHotReload(vite, lifecycleManager);
-  setupActionRouter(vite);
+  setupActionRouter(vite, buildFolder);
   const projectRoutes = await initRoutes(pagesRootFolder);
   const filteredProjectRoutes = buildFolder ? projectRoutes.filter((route) => !route.jayHtmlPath.startsWith(buildFolder)) : projectRoutes;
   const pluginRoutes = await scanPluginRoutes(projectRootFolder, filteredProjectRoutes);
@@ -2864,8 +3026,8 @@ function setupServiceHotReload(vite, lifecycleManager) {
     }
   });
 }
-function setupActionRouter(vite) {
-  vite.middlewares.use(actionBodyParser());
+function setupActionRouter(vite, buildFolder) {
+  vite.middlewares.use(actionBodyParser({ buildFolder }));
   vite.middlewares.use(ACTION_ENDPOINT_BASE, createActionRouter());
   getLogger().info(`[Actions] Action router mounted at ${ACTION_ENDPOINT_BASE}`);
 }
@@ -2898,6 +3060,28 @@ function setupFreezeEndpoint(vite, freezeStore) {
   });
   getLogger().info("[Freeze] Freeze endpoint mounted at /_jay/freeze");
 }
+function getRouteDir(route) {
+  return route.rawRoute.replace(/^\//, "") || "index";
+}
+function getRoutePrefix(jayHtmlPath, pagesRootFolder) {
+  const rel = path__default.relative(pagesRootFolder, path__default.dirname(jayHtmlPath));
+  const segments = rel.split(path__default.sep).filter(Boolean);
+  const staticSegments = [];
+  for (const seg of segments) {
+    if (seg.startsWith("["))
+      break;
+    staticSegments.push(seg);
+  }
+  return "/" + staticSegments.join("/");
+}
+function sendPageReload(vite, jayHtmlPath, pagesRootFolder) {
+  const routePrefix = getRoutePrefix(jayHtmlPath, pagesRootFolder);
+  vite.ws.send({
+    type: "custom",
+    event: "jay:page-reload",
+    data: { routePrefix }
+  });
+}
 function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder, projectRootFolder) {
   const watchedFiles = /* @__PURE__ */ new Set();
   const watchLinkedFiles = (files) => {
@@ -2924,7 +3108,7 @@ function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder, projectR
       clearServerElementCache();
       cache.clear().then(() => {
         getLogger().info(`[SlowRender] Cache cleared (jay-html changed: ${changedPath})`);
-        vite.ws.send({ type: "full-reload" });
+        sendPageReload(vite, changedPath, pagesRootFolder);
       });
       return;
     }
@@ -2939,7 +3123,7 @@ function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder, projectR
         getLogger().info(
           `[SlowRender] Cache invalidated for ${jayHtmlPath} (page.ts changed)`
         );
-        vite.ws.send({ type: "full-reload" });
+        sendPageReload(vite, jayHtmlPath, pagesRootFolder);
       });
       return;
     }
@@ -2950,7 +3134,7 @@ function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder, projectR
         getLogger().info(
           `[SlowRender] Cache invalidated for ${jayHtmlPath} (contract changed)`
         );
-        vite.ws.send({ type: "full-reload" });
+        sendPageReload(vite, jayHtmlPath, pagesRootFolder);
       });
       return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/dev-server",
-  "version": "0.16.0",
+  "version": "0.16.2",
   "type": "module",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -23,23 +23,25 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-stack": "^0.16.0",
-    "@jay-framework/compiler-shared": "^0.16.0",
-    "@jay-framework/component": "^0.16.0",
-    "@jay-framework/fullstack-component": "^0.16.0",
-    "@jay-framework/logger": "^0.16.0",
-    "@jay-framework/runtime": "^0.16.0",
-    "@jay-framework/stack-client-runtime": "^0.16.0",
-    "@jay-framework/stack-route-scanner": "^0.16.0",
-    "@jay-framework/stack-server-runtime": "^0.16.0",
-    "@jay-framework/view-state-merge": "^0.16.0",
+    "@jay-framework/compiler-jay-stack": "^0.16.2",
+    "@jay-framework/compiler-shared": "^0.16.2",
+    "@jay-framework/component": "^0.16.2",
+    "@jay-framework/fullstack-component": "^0.16.2",
+    "@jay-framework/logger": "^0.16.2",
+    "@jay-framework/runtime": "^0.16.2",
+    "@jay-framework/stack-client-runtime": "^0.16.2",
+    "@jay-framework/stack-route-scanner": "^0.16.2",
+    "@jay-framework/stack-server-runtime": "^0.16.2",
+    "@jay-framework/view-state-merge": "^0.16.2",
+    "busboy": "^1.6.0",
     "vite": "^5.0.11"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.16.0",
-    "@jay-framework/jay-cli": "^0.16.0",
-    "@jay-framework/stack-client-runtime": "^0.16.0",
+    "@jay-framework/dev-environment": "^0.16.2",
+    "@jay-framework/jay-cli": "^0.16.2",
+    "@jay-framework/stack-client-runtime": "^0.16.2",
     "@playwright/test": "^1.58.2",
+    "@types/busboy": "^1.5.4",
     "@types/express": "^5.0.2",
     "@types/node": "^22.15.21",
     "jsdom": "^23.2.0",