@jay-framework/dev-server 0.17.4 → 0.18.0

package/dist/index.d.ts

@@ -141,6 +141,7 @@ interface RouteInfo {
     jayHtmlPath: string;
     compPath: string;
 }
+type DevServerRouteRegistrar = (routes: DevServerRoute[]) => void;
 declare class DevServerService {
     private routes;
     private vite;
@@ -148,8 +149,17 @@ declare class DevServerService {
     private projectBase;
     private jayRollupConfig;
     private _freezeStore?;
-    constructor(routes: DevServerRoute[], vite: ViteDevServer, pagesBase: string, projectBase: string, jayRollupConfig: JayRollupConfig, _freezeStore?: FreezeStore);
+    private rescanRoutes?;
+    constructor(routes: DevServerRoute[], vite: ViteDevServer, pagesBase: string, projectBase: string, jayRollupConfig: JayRollupConfig, _freezeStore?: FreezeStore, rescanRoutes?: () => Promise<DevServerRoute[]>);
+    private routeRegistrar?;
     get freezeStore(): FreezeStore | undefined;
+    /** Register new route handlers with Express (or another HTTP layer). */
+    attachRouteRegistrar(registrar: DevServerRouteRegistrar): void;
+    /**
+     * Rescan the pages directory for new routes and register any that were
+     * added since dev-server startup (e.g. after AIditor Add Page).
+     */
+    refreshRoutes(): Promise<RouteInfo[]>;
     /** List all page routes in the project. */
     listRoutes(): RouteInfo[];
     /**
@@ -277,4 +287,4 @@ declare function createViteForCli(options: {
     tsConfigFilePath?: string;
 }): Promise<ViteDevServer>;
 
-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 };
+export { ACTION_ENDPOINT_BASE, type ActionBodyParserOptions, type ActionRouterOptions, type CreateViteServerOptions, DEV_SERVER_SERVICE, type DevServer, type DevServerOptions, type DevServerRoute, type DevServerRouteRegistrar, DevServerService, type FreezeEntry, FreezeStore, type RouteInfo, actionBodyParser, createActionRouter, createViteForCli, createViteServer, mkDevServer };

package/dist/index.js

@@ -10,13 +10,13 @@ import { createRequire } from "module";
 import "@jay-framework/compiler-shared";
 import * as path from "node:path";
 import path__default from "node:path";
-import { JAY_IMPORT_RESOLVER, injectHeadfullFSTemplates, parseContract, slowRenderTransform, discoverHeadlessInstances, assignCoordinatesToJayHtml, resolveHeadlessInstances } from "@jay-framework/compiler-jay-html";
+import { JAY_IMPORT_RESOLVER, injectHeadfullFSTemplates, parseContract, slowRenderTransform, assignCoordinatesToJayHtml, discoverHeadlessInstances } from "@jay-framework/compiler-jay-html";
 import { getLogger, getDevLogger } from "@jay-framework/logger";
 import { createRequire as createRequire$1 } from "node:module";
 import * as fsSync from "node:fs";
 import fsSync__default from "node:fs";
 import { scanRoutes, createRoute, routeToExpressRoute } from "@jay-framework/stack-route-scanner";
-import { discoverPluginsWithInit, sortPluginsByDependencies, executePluginServerInits, runInitCallbacks, actionRegistry, discoverAndRegisterActions, discoverAllPluginActions, runShutdownCallbacks, clearLifecycleCallbacks, clearServiceRegistry, clearClientInitData, loadPageParts, runLoadParams, DevSlowlyChangingPhase, SlowRenderCache, preparePluginClientInits, registerService, clearServerElementCache, scanPlugins, getServiceRegistry, materializeContracts, parseCookies, renderFastChangingData, mergeHeadTags, generateClientScript, getClientInitData, generateSSRPageHtml, generateFrozenPageHtml, validateForEachInstances, slowRenderInstances } from "@jay-framework/stack-server-runtime";
+import { discoverPluginsWithInit, sortPluginsByDependencies, executePluginServerInits, runInitCallbacks, actionRegistry, discoverAndRegisterActions, discoverAllPluginActions, runShutdownCallbacks, clearLifecycleCallbacks, clearServiceRegistry, clearClientInitData, loadPageParts, runLoadParams, DevSlowlyChangingPhase, SlowRenderCache, preparePluginClientInits, registerService, clearServerElementCache, scanPlugins, getServiceRegistry, materializeContracts, parseCookies, renderFastChangingData, mergeHeadTags, generateClientScript, getClientInitData, generateSSRPageHtml, generateFrozenPageHtml, slowRenderInstances } from "@jay-framework/stack-server-runtime";
 import * as fs from "node:fs/promises";
 import fs__default from "node:fs/promises";
 import { pathToFileURL } from "node:url";
@@ -1949,8 +1949,6 @@ function getStatusCodeForError(code, isActionError) {
       return 500;
   }
 }
-const DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024;
-const DEFAULT_MAX_FILES = 10;
 function mergeDottedMultipartKeys(body) {
   const keys = Object.keys(body);
   for (const key of keys) {
@@ -1971,7 +1969,7 @@ function mergeDottedMultipartKeys(body) {
     cur[parts[parts.length - 1]] = val;
   }
 }
-function parseMultipart(req, tempDir, maxFileSize, maxFiles) {
+function parseMultipart(req, tempDir) {
   return new Promise((resolve, reject) => {
     fs$1.mkdirSync(tempDir, { recursive: true });
     const files = {};
@@ -1980,11 +1978,7 @@ function parseMultipart(req, tempDir, maxFileSize, maxFiles) {
     let errored = false;
     const pendingWrites = [];
     const bb = Busboy({
-      headers: req.headers,
-      limits: {
-        fileSize: maxFileSize,
-        files: maxFiles
-      }
+      headers: req.headers
     });
     bb.on("file", (fieldname, stream, info) => {
       if (errored)
@@ -1993,26 +1987,14 @@ function parseMultipart(req, tempDir, maxFileSize, maxFiles) {
       const filename = info.filename || `upload-${fileCount}`;
       const tempPath = path$1.join(tempDir, `${fileCount}-${filename}`);
       let size = 0;
-      let truncated = false;
       const writeStream = fs$1.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,
@@ -2099,9 +2081,7 @@ function actionBodyParser(options) {
       }
       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 }) => {
+      parseMultipart(req, tempDir).then(({ body: body2, tempDir: td }) => {
         req.body = body2;
         req._jayTempDir = td;
         next();
@@ -2215,17 +2195,40 @@ class FreezeStore {
 }
 const DEV_SERVER_SERVICE = createJayService("DevServerService");
 class DevServerService {
-  constructor(routes, vite, pagesBase, projectBase, jayRollupConfig, _freezeStore) {
+  constructor(routes, vite, pagesBase, projectBase, jayRollupConfig, _freezeStore, rescanRoutes) {
+    __publicField(this, "routeRegistrar");
     this.routes = routes;
     this.vite = vite;
     this.pagesBase = pagesBase;
     this.projectBase = projectBase;
     this.jayRollupConfig = jayRollupConfig;
     this._freezeStore = _freezeStore;
+    this.rescanRoutes = rescanRoutes;
   }
   get freezeStore() {
     return this._freezeStore;
   }
+  /** Register new route handlers with Express (or another HTTP layer). */
+  attachRouteRegistrar(registrar) {
+    this.routeRegistrar = registrar;
+  }
+  /**
+   * Rescan the pages directory for new routes and register any that were
+   * added since dev-server startup (e.g. after AIditor Add Page).
+   */
+  async refreshRoutes() {
+    if (!this.rescanRoutes) {
+      return this.listRoutes();
+    }
+    const added = await this.rescanRoutes();
+    if (added.length > 0 && this.routeRegistrar) {
+      this.routeRegistrar(added);
+      getLogger().info(
+        `[Routes] Registered ${added.length} new route(s): ${added.map((r) => r.fsRoute.rawRoute).join(", ")}`
+      );
+    }
+    return this.listRoutes();
+  }
   /** List all page routes in the project. */
   listRoutes() {
     return this.routes.map((r) => ({
@@ -2585,14 +2588,19 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
   const fastViewState = renderedFast.rendered;
   const fastCarryForward = renderedFast.carryForward;
   const headTags = renderedFast.headTags ?? mergeHeadTags(cachedEntry.carryForward?.__slowHeadTags ?? []);
+  const fullViewState = deepMergeViewStates(
+    cachedEntry.slowViewState,
+    fastViewState,
+    clientTrackByMap || {}
+  );
   await sendResponse(
     vite,
     res,
     url,
-    cachedEntry.preRenderedPath,
+    route.jayHtmlPath,
     route.jayHtmlPath,
     pageParts,
-    fastViewState,
+    fullViewState,
     fastCarryForward,
     clientTrackByMap,
     projectInit,
@@ -2602,7 +2610,7 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     getRouteDir(route),
     cachedEntry.slowViewState,
     timing,
-    cachedEntry.preRenderedContent,
+    void 0,
     headTags
   );
 }
@@ -2806,15 +2814,13 @@ async function handleClientOnlyRequest(vite, route, options, slowlyPhase, pagePa
 async function sendResponse(vite, res, url, jayHtmlPath, sourceJayHtmlPath, pageParts, viewState, carryForward, clientTrackByMap, projectInit, pluginsForPage, options, routePattern, routeDir, slowViewState, timing, preLoadedContent, headTags) {
   let pageHtml;
   try {
-    let jayHtmlContent = preLoadedContent ?? await fs__default.readFile(jayHtmlPath, "utf-8");
-    const jayHtmlFilename = path__default.basename(jayHtmlPath);
     const jayHtmlDir = path__default.dirname(jayHtmlPath);
-    const sourceDir = path__default.dirname(sourceJayHtmlPath);
-    jayHtmlContent = injectHeadfullFSTemplates(jayHtmlContent, sourceDir, JAY_IMPORT_RESOLVER);
+    let jayHtmlContent = preLoadedContent ?? await fs__default.readFile(jayHtmlPath, "utf-8");
+    jayHtmlContent = injectHeadfullFSTemplates(jayHtmlContent, jayHtmlDir, JAY_IMPORT_RESOLVER);
     pageHtml = await generateSSRPageHtml(
       vite,
       jayHtmlContent,
-      jayHtmlFilename,
+      path__default.basename(jayHtmlPath),
       jayHtmlDir,
       viewState,
       jayHtmlPath,
@@ -2833,8 +2839,7 @@ async function sendResponse(vite, res, url, jayHtmlPath, sourceJayHtmlPath, page
         slowViewState,
         routePattern
       },
-      // Pass source directory for headfull FS file resolution when using pre-rendered path
-      jayHtmlDir !== sourceDir ? sourceDir : void 0,
+      void 0,
       headTags
     );
   } catch (err) {
@@ -2919,37 +2924,21 @@ async function handleFrozenRequest(vite, route, options, freezeStore, slowRender
 }
 async function preRenderJayHtml(route, slowViewState, headlessContracts, headlessInstanceComponents, partKeys = []) {
   const jayHtmlContent = await fs__default.readFile(route.jayHtmlPath, "utf-8");
-  const contractPath = route.jayHtmlPath.replace(".jay-html", ".jay-contract");
-  let contract;
-  try {
-    const contractContent = await fs__default.readFile(contractPath, "utf-8");
-    const parseResult = parseContract(contractContent, path__default.basename(contractPath));
-    if (parseResult.val) {
-      contract = parseResult.val;
-    } else if (parseResult.validations.length > 0) {
-      getLogger().error(
-        `[SlowRender] Contract parse error for ${contractPath}: ${parseResult.validations.join(", ")}`
-      );
-      return void 0;
-    }
-  } catch (error) {
-    if (error.code !== "ENOENT") {
-      getLogger().error(`[SlowRender] Error reading contract ${contractPath}: ${error}`);
-      return void 0;
-    }
-  }
-  const hasPageLevelSlowData = slowViewState && Object.keys(slowViewState).some((k) => !partKeys.includes(k));
-  if (!contract && hasPageLevelSlowData) {
-    getLogger().warn(
-      `[SlowRender] Page ${route.jayHtmlPath} has slow ViewState but no contract. Without a contract, slow bindings cannot be resolved. Move data to withFastRender or add a .jay-contract file with phase annotations.`
-    );
-  }
   const sourceDir = path__default.dirname(route.jayHtmlPath);
   const jayHtmlWithTemplates = injectHeadfullFSTemplates(
     jayHtmlContent,
     sourceDir,
     JAY_IMPORT_RESOLVER
   );
+  let contract;
+  const contractPath = route.jayHtmlPath.replace(".jay-html", ".jay-contract");
+  try {
+    const contractContent = await fs__default.readFile(contractPath, "utf-8");
+    const parseResult = parseContract(contractContent, path__default.basename(contractPath));
+    if (parseResult.val)
+      contract = parseResult.val;
+  } catch {
+  }
   const result = slowRenderTransform({
     jayHtmlContent: jayHtmlWithTemplates,
     slowViewState,
@@ -2966,28 +2955,19 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
     }
     return void 0;
   }
-  let preRenderedJayHtml = result.val.preRenderedJayHtml;
+  const preRenderedJayHtml = result.val.preRenderedJayHtml;
   let instancePhaseData;
   let forEachInstances;
   if (headlessInstanceComponents.length > 0) {
-    const discoveryResult = discoverHeadlessInstances(preRenderedJayHtml);
-    const htmlWithRefs = discoveryResult.preRenderedJayHtml;
     const headlessContractNameSet = new Set(
       headlessInstanceComponents.map((c2) => c2.contractName)
     );
-    preRenderedJayHtml = assignCoordinatesToJayHtml(htmlWithRefs, headlessContractNameSet);
-    const finalDiscovery = discoverHeadlessInstances(preRenderedJayHtml);
+    const withCoords = assignCoordinatesToJayHtml(
+      jayHtmlWithTemplates,
+      headlessContractNameSet
+    );
+    const finalDiscovery = discoverHeadlessInstances(withCoords);
     if (finalDiscovery.forEachInstances.length > 0) {
-      const validationErrors = validateForEachInstances(
-        finalDiscovery.forEachInstances,
-        headlessInstanceComponents
-      );
-      if (validationErrors.length > 0) {
-        getLogger().error(
-          `[SlowRender] ForEach instance validation failed: ${validationErrors.join(", ")}`
-        );
-        return void 0;
-      }
       forEachInstances = finalDiscovery.forEachInstances;
     }
     if (finalDiscovery.instances.length > 0) {
@@ -2997,19 +2977,6 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
       );
       if (slowResult) {
         instancePhaseData = slowResult.instancePhaseData;
-        const pass2Result = resolveHeadlessInstances(
-          preRenderedJayHtml,
-          slowResult.resolvedData,
-          JAY_IMPORT_RESOLVER
-        );
-        if (pass2Result.val) {
-          preRenderedJayHtml = pass2Result.val;
-        }
-        if (pass2Result.validations.length > 0) {
-          getLogger().error(
-            `[SlowRender] Instance resolution warnings for ${route.jayHtmlPath}: ${pass2Result.validations.join(", ")}`
-          );
-        }
       }
       if (!instancePhaseData) {
         const componentByContractName = /* @__PURE__ */ new Map();
@@ -3017,7 +2984,7 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
           componentByContractName.set(comp.contractName, comp);
         }
         instancePhaseData = {
-          discovered: discoveryResult.instances.filter((i) => componentByContractName.has(i.contractName)).map((i) => {
+          discovered: finalDiscovery.instances.filter((i) => componentByContractName.has(i.contractName)).map((i) => {
             const comp = componentByContractName.get(i.contractName);
             const contractProps = comp.contract?.props ?? [];
             const normalizedProps = {};
@@ -3122,13 +3089,44 @@ async function mkDevServer(rawOptions) {
       pluginClientInits
     )
   );
+  async function rescanAndMergeNewRoutes() {
+    const projectRoutes2 = await initRoutes(options.pagesRootFolder);
+    const filteredProjectRoutes2 = options.buildFolder ? projectRoutes2.filter((route) => !route.jayHtmlPath.startsWith(options.buildFolder)) : projectRoutes2;
+    const pluginRoutes2 = await scanPluginRoutes(
+      options.projectRootFolder,
+      filteredProjectRoutes2
+    );
+    const scannedJayRoutes = [...filteredProjectRoutes2, ...pluginRoutes2];
+    const existingRawRoutes = new Set(devServerRoutes.map((r) => r.fsRoute.rawRoute));
+    const added = [];
+    for (const jayRoute of scannedJayRoutes) {
+      if (existingRawRoutes.has(jayRoute.rawRoute))
+        continue;
+      const devRoute = mkRoute(
+        jayRoute,
+        vite,
+        slowlyPhase,
+        options,
+        slowRenderCache,
+        freezeStore,
+        projectInit,
+        pluginsWithInit,
+        pluginClientInits
+      );
+      devServerRoutes.push(devRoute);
+      existingRawRoutes.add(jayRoute.rawRoute);
+      added.push(devRoute);
+    }
+    return added;
+  }
   const service = new DevServerService(
     devServerRoutes,
     vite,
     options.pagesRootFolder,
     options.projectRootFolder,
     options.jayRollupConfig,
-    freezeStore
+    freezeStore,
+    rescanAndMergeNewRoutes
   );
   registerService(DEV_SERVER_SERVICE, service);
   return {
@@ -3172,8 +3170,8 @@ function setupServiceHotReload(vite, lifecycleManager) {
   });
 }
 function setupActionRouter(vite, buildFolder) {
-  vite.middlewares.use(actionBodyParser({ buildFolder }));
-  vite.middlewares.use(ACTION_ENDPOINT_BASE, createActionRouter());
+  vite.middlewares.use(actionBodyParser({ buildFolder, registry: actionRegistry }));
+  vite.middlewares.use(ACTION_ENDPOINT_BASE, createActionRouter({ registry: actionRegistry }));
   getLogger().info(`[Actions] Action router mounted at ${ACTION_ENDPOINT_BASE}`);
 }
 function setupFreezeEndpoint(vite, freezeStore) {

package/package.json

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