@jay-framework/dev-server 0.13.0 → 0.15.0

package/dist/index.d.ts

@@ -13,12 +13,16 @@ interface DevServerOptions {
     pagesRootFolder?: string;
     /**
      * Folder where build artifacts are stored.
-     * Pre-rendered jay-html files are written to `<buildFolder>/slow-render-cache/`.
+     * Pre-rendered jay-html files are written to `<buildFolder>/pre-rendered/`.
      * Defaults to `<projectRootFolder>/build`.
      */
     buildFolder?: string;
     jayRollupConfig: JayRollupConfig;
-    dontCacheSlowly: boolean;
+    /**
+     * Disable server-side rendering. When true, pages are served as client-only
+     * (element target, no hydration). Useful for development without SSR overhead.
+     */
+    disableSSR?: boolean;
     /**
      * Disable automation integration.
      * When false (default), pages are wrapped with automation API for dev tooling.
@@ -191,7 +195,7 @@ declare function createViteServer(options: CreateViteServerOptions): Promise<Vit
  *
  * This is a convenience wrapper around createViteServer with CLI-appropriate defaults.
  * Disables dependency optimization and ignores the build/ folder to avoid errors
- * from stale build artifacts (e.g., build/client-scripts/ referencing build/slow-render-cache/).
+ * from stale build artifacts (e.g., build/debug/client-entry/ referencing build/pre-rendered/).
  */
 declare function createViteForCli(options: {
     projectRoot: string;

package/dist/index.js

@@ -10,12 +10,13 @@ import { createRequire } from "module";
 import "@jay-framework/compiler-shared";
 import * as path from "node:path";
 import path__default from "node:path";
-import { discoverHeadlessInstances, parseContract, slowRenderTransform, JAY_IMPORT_RESOLVER, resolveHeadlessInstances } from "@jay-framework/compiler-jay-html";
+import { JAY_IMPORT_RESOLVER, injectHeadfullFSTemplates, parseContract, slowRenderTransform, discoverHeadlessInstances, resolveHeadlessInstances } from "@jay-framework/compiler-jay-html";
 import { getLogger, getDevLogger } from "@jay-framework/logger";
 import { createRequire as createRequire$1 } from "node:module";
 import * as fs from "node:fs";
+import crypto from "node:crypto";
 import { scanRoutes, routeToExpressRoute } from "@jay-framework/stack-route-scanner";
-import { discoverPluginsWithInit, sortPluginsByDependencies, executePluginServerInits, runInitCallbacks, actionRegistry, discoverAndRegisterActions, discoverAllPluginActions, runShutdownCallbacks, clearLifecycleCallbacks, clearServiceRegistry, clearClientInitData, DevSlowlyChangingPhase, SlowRenderCache, preparePluginClientInits, getServiceRegistry, materializeContracts, loadPageParts, renderFastChangingData, validateForEachInstances, slowRenderInstances, generateClientScript, getClientInitData, resolveServices } from "@jay-framework/stack-server-runtime";
+import { discoverPluginsWithInit, sortPluginsByDependencies, executePluginServerInits, runInitCallbacks, actionRegistry, discoverAndRegisterActions, discoverAllPluginActions, runShutdownCallbacks, clearLifecycleCallbacks, clearServiceRegistry, clearClientInitData, DevSlowlyChangingPhase, SlowRenderCache, preparePluginClientInits, invalidateServerElementCache, getServiceRegistry, materializeContracts, loadPageParts, renderFastChangingData, generateClientScript, getClientInitData, generateSSRPageHtml, validateForEachInstances, slowRenderInstances } from "@jay-framework/stack-server-runtime";
 import fs$1 from "node:fs/promises";
 import { pathToFileURL } from "node:url";
 const s$1 = createRequire(import.meta.url), e$1 = s$1("typescript"), c$1 = new Proxy(e$1, {
@@ -1364,9 +1365,11 @@ async function createViteServer(options) {
     logLevel = "info",
     clearScreen = true
   } = options;
+  const instanceId = crypto.randomBytes(4).toString("hex");
+  const cacheDir = path__default.join(projectRoot, "node_modules", `.vite-${instanceId}`);
   const vite = await createServer({
     // Don't start HTTP server - we use middleware mode
-    server: { middlewareMode: true },
+    server: { middlewareMode: true, watch: { ignored: ["**/build/**"] } },
     // Use Jay Stack compiler for .jay-html and other custom transforms
     plugins: [...jayStackCompiler(jayRollupConfig)],
     // Custom app type (no default middleware)
@@ -1375,6 +1378,8 @@ async function createViteServer(options) {
     base,
     // Root directory for module resolution
     root: pagesRoot,
+    // Isolate dep optimization cache per instance
+    cacheDir,
     // SSR configuration
     ssr: {
       // Mark jay-framework packages as external so Vite uses Node's require
@@ -1390,6 +1395,13 @@ async function createViteServer(options) {
     logLevel,
     clearScreen
   });
+  const originalClose = vite.close.bind(vite);
+  vite.close = async () => {
+    await originalClose();
+    const { rm } = await import("node:fs/promises");
+    await rm(cacheDir, { recursive: true, force: true }).catch(() => {
+    });
+  };
   return vite;
 }
 async function createViteForCli(options) {
@@ -1841,7 +1853,7 @@ function defaults(options) {
     pagesRootFolder,
     projectRootFolder,
     buildFolder,
-    dontCacheSlowly: options.dontCacheSlowly,
+    disableSSR: options.disableSSR,
     jayRollupConfig: {
       ...options.jayRollupConfig || {},
       tsConfigFilePath
@@ -1896,41 +1908,12 @@ function mkRoute(route, vite, slowlyPhase, options, slowRenderCache, projectInit
         language: "en",
         url
       };
-      const useSlowRenderCache = !options.dontCacheSlowly;
-      let cachedEntry = useSlowRenderCache ? slowRenderCache.get(route.jayHtmlPath, pageParams) : void 0;
-      if (cachedEntry) {
-        try {
-          await fs$1.access(cachedEntry.preRenderedPath);
-        } catch {
-          getLogger().info(
-            `[SlowRender] Cached file missing, rebuilding: ${cachedEntry.preRenderedPath}`
-          );
-          await slowRenderCache.invalidate(route.jayHtmlPath);
-          cachedEntry = void 0;
-        }
-      }
-      if (cachedEntry) {
-        await handleCachedRequest(
-          vite,
-          route,
-          options,
-          cachedEntry,
-          pageParams,
-          pageProps,
-          allPluginClientInits,
-          allPluginsWithInit,
-          projectInit,
-          res,
-          url,
-          timing
-        );
-      } else if (useSlowRenderCache) {
-        await handlePreRenderRequest(
+      if (options.disableSSR) {
+        await handleClientOnlyRequest(
           vite,
           route,
           options,
           slowlyPhase,
-          slowRenderCache,
           pageParams,
           pageProps,
           allPluginClientInits,
@@ -1941,20 +1924,39 @@ function mkRoute(route, vite, slowlyPhase, options, slowRenderCache, projectInit
           timing
         );
       } else {
-        await handleDirectRequest(
-          vite,
-          route,
-          options,
-          slowlyPhase,
-          pageParams,
-          pageProps,
-          allPluginClientInits,
-          allPluginsWithInit,
-          projectInit,
-          res,
-          url,
-          timing
-        );
+        const cachedEntry = await slowRenderCache.get(route.jayHtmlPath, pageParams);
+        if (cachedEntry) {
+          await handleCachedRequest(
+            vite,
+            route,
+            options,
+            cachedEntry,
+            pageParams,
+            pageProps,
+            allPluginClientInits,
+            allPluginsWithInit,
+            projectInit,
+            res,
+            url,
+            timing
+          );
+        } else {
+          await handlePreRenderRequest(
+            vite,
+            route,
+            options,
+            slowlyPhase,
+            slowRenderCache,
+            pageParams,
+            pageProps,
+            allPluginClientInits,
+            allPluginsWithInit,
+            projectInit,
+            res,
+            url,
+            timing
+          );
+        }
       }
     } catch (e2) {
       vite?.ssrFixStacktrace(e2);
@@ -1973,7 +1975,10 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     options.pagesRootFolder,
     options.projectRootFolder,
     options.jayRollupConfig,
-    { preRenderedPath: cachedEntry.preRenderedPath }
+    {
+      preRenderedPath: cachedEntry.preRenderedPath,
+      preRenderedContent: cachedEntry.preRenderedContent
+    }
   );
   timing?.recordViteSsr(Date.now() - loadStart);
   if (!pagePartsResult.val) {
@@ -1988,12 +1993,19 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     allPluginsWithInit,
     usedPackages
   );
+  const instancePhaseData = cachedEntry.carryForward?.__instances;
+  const forEachInstances = instancePhaseData?.forEachInstances;
+  const headlessComps = pagePartsResult.val.headlessInstanceComponents;
   const fastStart = Date.now();
   const renderedFast = await renderFastChangingData(
     pageParams,
     pageProps,
     cachedEntry.carryForward,
-    pageParts
+    pageParts,
+    instancePhaseData,
+    forEachInstances,
+    headlessComps,
+    cachedEntry.slowViewState
   );
   timing?.recordFastRender(Date.now() - fastStart);
   if (renderedFast.kind !== "PhaseOutput") {
@@ -2001,45 +2013,14 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     timing?.end();
     return;
   }
-  let fastViewState = renderedFast.rendered;
-  let fastCarryForward = renderedFast.carryForward;
-  const instancePhaseData = cachedEntry.carryForward?.__instances;
-  const headlessComps = pagePartsResult.val.headlessInstanceComponents;
-  if (instancePhaseData && headlessComps.length > 0) {
-    const instanceFastResult = await renderFastChangingDataForInstances(
-      instancePhaseData,
-      headlessComps
-    );
-    if (instanceFastResult) {
-      fastViewState = {
-        ...fastViewState,
-        __headlessInstances: instanceFastResult.viewStates
-      };
-      fastCarryForward = {
-        ...fastCarryForward,
-        __headlessInstances: instanceFastResult.carryForwards
-      };
-    }
-    if (instancePhaseData.forEachInstances && instancePhaseData.forEachInstances.length > 0) {
-      const forEachResult = await renderFastChangingDataForForEachInstances(
-        instancePhaseData.forEachInstances,
-        headlessComps,
-        fastViewState
-      );
-      if (forEachResult) {
-        const existingHeadless = fastViewState.__headlessInstances || {};
-        fastViewState = {
-          ...fastViewState,
-          __headlessInstances: { ...existingHeadless, ...forEachResult }
-        };
-      }
-    }
-  }
+  const fastViewState = renderedFast.rendered;
+  const fastCarryForward = renderedFast.carryForward;
   await sendResponse(
     vite,
     res,
     url,
     cachedEntry.preRenderedPath,
+    route.jayHtmlPath,
     pageParts,
     fastViewState,
     fastCarryForward,
@@ -2048,7 +2029,8 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     pluginsForPage,
     options,
     cachedEntry.slowViewState,
-    timing
+    timing,
+    cachedEntry.preRenderedContent
   );
 }
 async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRenderCache, pageParams, pageProps, allPluginClientInits, allPluginsWithInit, projectInit, res, url, timing) {
@@ -2071,7 +2053,10 @@ async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRen
   const renderedSlowly = await slowlyPhase.runSlowlyForPage(
     pageParams,
     pageProps,
-    initialPartsResult.val.parts
+    initialPartsResult.val.parts,
+    void 0,
+    void 0,
+    route.jayHtmlPath
   );
   if (renderedSlowly.kind !== "PhaseOutput") {
     timing?.recordSlowRender(Date.now() - slowStart);
@@ -2107,98 +2092,30 @@ async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRen
     };
   }
   const carryForward = instancePhaseDataForCache ? { ...renderedSlowly.carryForward, __instances: instancePhaseDataForCache } : renderedSlowly.carryForward;
-  const preRenderedPath = await slowRenderCache.set(
+  const cachedEntry = await slowRenderCache.set(
     route.jayHtmlPath,
     pageParams,
     preRenderResult.preRenderedJayHtml,
     renderedSlowly.rendered,
     carryForward
   );
-  getLogger().info(`[SlowRender] Cached pre-rendered jay-html at ${preRenderedPath}`);
-  const pagePartsResult = await loadPageParts(
+  getLogger().info(`[SlowRender] Cached pre-rendered jay-html at ${cachedEntry.preRenderedPath}`);
+  await handleCachedRequest(
     vite,
     route,
-    options.pagesRootFolder,
-    options.projectRootFolder,
-    options.jayRollupConfig,
-    { preRenderedPath }
-  );
-  if (!pagePartsResult.val) {
-    getLogger().info(pagePartsResult.validations.join("\n"));
-    res.status(500).end(pagePartsResult.validations.join("\n"));
-    timing?.end();
-    return;
-  }
-  const { parts: pageParts, clientTrackByMap, usedPackages } = pagePartsResult.val;
-  const pluginsForPage = filterPluginsForPage(
-    allPluginClientInits,
-    allPluginsWithInit,
-    usedPackages
-  );
-  const fastStart = Date.now();
-  const renderedFast = await renderFastChangingData(
+    options,
+    cachedEntry,
     pageParams,
     pageProps,
-    carryForward,
-    pageParts
-  );
-  timing?.recordFastRender(Date.now() - fastStart);
-  if (renderedFast.kind !== "PhaseOutput") {
-    handleOtherResponseCodes(res, renderedFast);
-    timing?.end();
-    return;
-  }
-  let fastViewState = renderedFast.rendered;
-  let fastCarryForward = renderedFast.carryForward;
-  const instancePhaseData = carryForward?.__instances;
-  const headlessComps = pagePartsResult.val.headlessInstanceComponents;
-  if (instancePhaseData && headlessComps.length > 0) {
-    const instanceFastResult = await renderFastChangingDataForInstances(
-      instancePhaseData,
-      headlessComps
-    );
-    if (instanceFastResult) {
-      fastViewState = {
-        ...fastViewState,
-        __headlessInstances: instanceFastResult.viewStates
-      };
-      fastCarryForward = {
-        ...fastCarryForward,
-        __headlessInstances: instanceFastResult.carryForwards
-      };
-    }
-    if (instancePhaseData.forEachInstances && instancePhaseData.forEachInstances.length > 0) {
-      const forEachResult = await renderFastChangingDataForForEachInstances(
-        instancePhaseData.forEachInstances,
-        headlessComps,
-        fastViewState
-      );
-      if (forEachResult) {
-        const existingHeadless = fastViewState.__headlessInstances || {};
-        fastViewState = {
-          ...fastViewState,
-          __headlessInstances: { ...existingHeadless, ...forEachResult }
-        };
-      }
-    }
-  }
-  await sendResponse(
-    vite,
+    allPluginClientInits,
+    allPluginsWithInit,
+    projectInit,
     res,
     url,
-    preRenderedPath,
-    pageParts,
-    fastViewState,
-    fastCarryForward,
-    clientTrackByMap,
-    projectInit,
-    pluginsForPage,
-    options,
-    renderedSlowly.rendered,
     timing
   );
 }
-async function handleDirectRequest(vite, route, options, slowlyPhase, pageParams, pageProps, allPluginClientInits, allPluginsWithInit, projectInit, res, url, timing) {
+async function handleClientOnlyRequest(vite, route, options, slowlyPhase, pageParams, pageProps, allPluginClientInits, allPluginsWithInit, projectInit, res, url, timing) {
   const loadStart = Date.now();
   const pagePartsResult = await loadPageParts(
     vite,
@@ -2218,7 +2135,10 @@ async function handleDirectRequest(vite, route, options, slowlyPhase, pageParams
     parts: pageParts,
     serverTrackByMap,
     clientTrackByMap,
-    usedPackages
+    usedPackages,
+    headlessInstanceComponents,
+    discoveredInstances,
+    forEachInstances
   } = pagePartsResult.val;
   const pluginsForPage = filterPluginsForPage(
     allPluginClientInits,
@@ -2226,7 +2146,14 @@ async function handleDirectRequest(vite, route, options, slowlyPhase, pageParams
     usedPackages
   );
   const slowStart = Date.now();
-  const renderedSlowly = await slowlyPhase.runSlowlyForPage(pageParams, pageProps, pageParts);
+  const renderedSlowly = await slowlyPhase.runSlowlyForPage(
+    pageParams,
+    pageProps,
+    pageParts,
+    discoveredInstances,
+    headlessInstanceComponents,
+    route.jayHtmlPath
+  );
   if (renderedSlowly.kind !== "PhaseOutput") {
     timing?.recordSlowRender(Date.now() - slowStart);
     if (renderedSlowly.kind === "ClientError") {
@@ -2235,131 +2162,107 @@ async function handleDirectRequest(vite, route, options, slowlyPhase, pageParams
     timing?.end();
     return;
   }
-  let instanceViewStates;
-  let instancePhaseDataForFast;
-  let forEachInstancesForFast;
-  const headlessInstanceComponents = pagePartsResult.val.headlessInstanceComponents ?? [];
-  if (headlessInstanceComponents.length > 0) {
-    const jayHtmlContent = await fs$1.readFile(route.jayHtmlPath, "utf-8");
-    const discoveryResult = discoverHeadlessInstances(jayHtmlContent);
-    if (discoveryResult.forEachInstances.length > 0) {
-      const validationErrors = validateForEachInstances(
-        discoveryResult.forEachInstances,
-        headlessInstanceComponents
-      );
-      if (validationErrors.length > 0) {
-        getLogger().error(
-          `[SlowRender] ForEach instance validation failed: ${validationErrors.join(", ")}`
-        );
-        res.status(500).end(validationErrors.join("\n"));
-        timing?.end();
-        return;
-      }
-      forEachInstancesForFast = discoveryResult.forEachInstances;
-    }
-    if (discoveryResult.instances.length > 0) {
-      const slowResult = await slowRenderInstances(
-        discoveryResult.instances,
-        headlessInstanceComponents
-      );
-      if (slowResult) {
-        instanceViewStates = { ...slowResult.slowViewStates };
-        instancePhaseDataForFast = slowResult.instancePhaseData;
-      }
-    }
-  }
   timing?.recordSlowRender(Date.now() - slowStart);
+  const instancePhaseData = renderedSlowly.carryForward?.__instances;
   const fastStart = Date.now();
   const renderedFast = await renderFastChangingData(
     pageParams,
     pageProps,
     renderedSlowly.carryForward,
-    pageParts
+    pageParts,
+    instancePhaseData,
+    forEachInstances,
+    headlessInstanceComponents,
+    renderedSlowly.rendered
   );
-  if (instancePhaseDataForFast && instanceViewStates) {
-    const instanceFastResult = await renderFastChangingDataForInstances(
-      instancePhaseDataForFast,
-      headlessInstanceComponents
-    );
-    if (instanceFastResult) {
-      for (const [coordKey, fastVS] of Object.entries(instanceFastResult.viewStates)) {
-        instanceViewStates[coordKey] = {
-          ...instanceViewStates[coordKey] || {},
-          ...fastVS
-        };
-      }
-    }
-  }
-  if (forEachInstancesForFast && renderedFast.kind === "PhaseOutput") {
-    const forEachResult = await renderFastChangingDataForForEachInstances(
-      forEachInstancesForFast,
-      headlessInstanceComponents,
-      { ...renderedSlowly.rendered, ...renderedFast.rendered }
-    );
-    if (forEachResult) {
-      if (!instanceViewStates)
-        instanceViewStates = {};
-      for (const [coordKey, fastVS] of Object.entries(forEachResult)) {
-        instanceViewStates[coordKey] = fastVS;
-      }
-    }
-  }
   timing?.recordFastRender(Date.now() - fastStart);
   if (renderedFast.kind !== "PhaseOutput") {
     handleOtherResponseCodes(res, renderedFast);
     timing?.end();
     return;
   }
-  let viewState;
-  if (serverTrackByMap && Object.keys(serverTrackByMap).length > 0) {
-    viewState = deepMergeViewStates(
-      renderedSlowly.rendered,
-      renderedFast.rendered,
-      serverTrackByMap
-    );
-  } else {
-    viewState = { ...renderedSlowly.rendered, ...renderedFast.rendered };
-  }
-  if (instanceViewStates && Object.keys(instanceViewStates).length > 0) {
-    viewState = {
-      ...viewState,
-      __headlessInstances: instanceViewStates
-    };
-  }
-  await sendResponse(
-    vite,
-    res,
-    url,
-    route.jayHtmlPath,
-    pageParts,
-    viewState,
-    renderedFast.carryForward,
-    clientTrackByMap,
-    projectInit,
-    pluginsForPage,
-    options,
-    void 0,
-    timing
+  const viewState = deepMergeViewStates(
+    renderedSlowly.rendered,
+    renderedFast.rendered,
+    serverTrackByMap || {}
   );
-}
-async function sendResponse(vite, res, url, jayHtmlPath, pageParts, viewState, carryForward, clientTrackByMap, projectInit, pluginsForPage, options, slowViewState, timing) {
+  const fastCF = renderedFast.carryForward;
   const pageHtml = generateClientScript(
     viewState,
-    carryForward,
+    fastCF,
     pageParts,
-    jayHtmlPath,
+    route.jayHtmlPath,
     clientTrackByMap,
     getClientInitData(),
     projectInit,
     pluginsForPage,
     {
-      enableAutomation: !options.disableAutomation,
-      slowViewState
+      enableAutomation: !options.disableAutomation
     }
   );
   if (options.buildFolder) {
     const pageName = !url || url === "/" ? "index" : url.replace(/^\//, "").replace(/\//g, "-");
-    const clientScriptDir = path__default.join(options.buildFolder, "client-scripts");
+    const clientScriptDir = path__default.join(options.buildFolder, "debug", "client-entry");
+    await fs$1.mkdir(clientScriptDir, { recursive: true });
+    await fs$1.writeFile(path__default.join(clientScriptDir, `${pageName}.html`), pageHtml, "utf-8");
+  }
+  const viteStart = Date.now();
+  const compiledPageHtml = await vite.transformIndexHtml(!!url ? url : "/", pageHtml);
+  timing?.recordViteClient(Date.now() - viteStart);
+  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, slowViewState, timing, preLoadedContent) {
+  let pageHtml;
+  const routeDir = path__default.dirname(path__default.relative(options.pagesRootFolder, sourceJayHtmlPath));
+  try {
+    let jayHtmlContent = preLoadedContent ?? await fs$1.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);
+    pageHtml = await generateSSRPageHtml(
+      vite,
+      jayHtmlContent,
+      jayHtmlFilename,
+      jayHtmlDir,
+      viewState,
+      jayHtmlPath,
+      pageParts,
+      carryForward,
+      clientTrackByMap,
+      getClientInitData(),
+      options.buildFolder,
+      options.projectRootFolder,
+      routeDir,
+      options.jayRollupConfig?.tsConfigFilePath,
+      projectInit,
+      pluginsForPage,
+      {
+        enableAutomation: !options.disableAutomation,
+        slowViewState
+      }
+    );
+  } catch (err) {
+    getLogger().warn(`[SSR] Failed, falling back to client rendering: ${err.message}`);
+    pageHtml = generateClientScript(
+      viewState,
+      carryForward,
+      pageParts,
+      jayHtmlPath,
+      clientTrackByMap,
+      getClientInitData(),
+      projectInit,
+      pluginsForPage,
+      {
+        enableAutomation: !options.disableAutomation,
+        slowViewState
+      }
+    );
+  }
+  if (options.buildFolder) {
+    const pageName = !url || url === "/" ? "index" : url.replace(/^\//, "").replace(/\//g, "-");
+    const clientScriptDir = path__default.join(options.buildFolder, "debug", "client-entry");
     await fs$1.mkdir(clientScriptDir, { recursive: true });
     await fs$1.writeFile(path__default.join(clientScriptDir, `${pageName}.html`), pageHtml, "utf-8");
   }
@@ -2390,12 +2293,23 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
       return void 0;
     }
   }
-  const result = slowRenderTransform({
+  if (!contract && slowViewState && Object.keys(slowViewState).length > 0) {
+    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
+  );
+  const result = slowRenderTransform({
+    jayHtmlContent: jayHtmlWithTemplates,
     slowViewState,
     contract,
     headlessContracts,
-    sourceDir: path__default.dirname(route.jayHtmlPath),
+    sourceDir,
     importResolver: JAY_IMPORT_RESOLVER
   });
   if (!result.val) {
@@ -2446,89 +2360,42 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
           );
         }
       }
-    }
-  }
-  return { preRenderedJayHtml, instancePhaseData, forEachInstances };
-}
-async function renderFastChangingDataForInstances(instancePhaseData, headlessInstanceComponents) {
-  const componentByContractName = /* @__PURE__ */ new Map();
-  for (const comp of headlessInstanceComponents) {
-    componentByContractName.set(comp.contractName, comp);
-  }
-  const viewStates = {};
-  const carryForwards = {};
-  let hasResults = false;
-  for (const instance of instancePhaseData.discovered) {
-    const coordKey = instance.coordinate.join("/");
-    const comp = componentByContractName.get(instance.contractName);
-    if (!comp || !comp.compDefinition.fastRender) {
-      continue;
-    }
-    const instanceCarryForward = instancePhaseData.carryForwards[coordKey] || {};
-    const services = resolveServices(comp.compDefinition.services);
-    const fastResult = await comp.compDefinition.fastRender(
-      instance.props,
-      instanceCarryForward,
-      ...services
-    );
-    if (fastResult.kind === "PhaseOutput") {
-      viewStates[coordKey] = fastResult.rendered;
-      carryForwards[coordKey] = fastResult.carryForward;
-      hasResults = true;
-    }
-  }
-  return hasResults ? { viewStates, carryForwards } : void 0;
-}
-async function renderFastChangingDataForForEachInstances(forEachInstances, headlessInstanceComponents, mergedViewState) {
-  const componentByContractName = /* @__PURE__ */ new Map();
-  for (const comp of headlessInstanceComponents) {
-    componentByContractName.set(comp.contractName, comp);
-  }
-  const viewStates = {};
-  let hasResults = false;
-  for (const instance of forEachInstances) {
-    const comp = componentByContractName.get(instance.contractName);
-    if (!comp)
-      continue;
-    const items = resolvePathValue(mergedViewState, instance.forEachPath);
-    if (!Array.isArray(items))
-      continue;
-    for (const item of items) {
-      const trackByValue = String(item[instance.trackBy]);
-      const props = {};
-      for (const [propName, binding] of Object.entries(instance.propBindings)) {
-        props[propName] = resolveBinding(String(binding), item);
-      }
-      if (comp.compDefinition.fastRender) {
-        const services = resolveServices(comp.compDefinition.services);
-        const fastResult = await comp.compDefinition.fastRender(props, ...services);
-        if (fastResult.kind === "PhaseOutput") {
-          const coord = [trackByValue, instance.coordinateSuffix].toString();
-          viewStates[coord] = fastResult.rendered;
-          hasResults = true;
+      if (!instancePhaseData) {
+        const componentByContractName = /* @__PURE__ */ new Map();
+        for (const comp of headlessInstanceComponents) {
+          componentByContractName.set(comp.contractName, comp);
         }
+        instancePhaseData = {
+          discovered: discoveryResult.instances.filter((i) => componentByContractName.has(i.contractName)).map((i) => {
+            const comp = componentByContractName.get(i.contractName);
+            const contractProps = comp.contract?.props ?? [];
+            const normalizedProps = {};
+            for (const [key, value] of Object.entries(i.props)) {
+              const match = contractProps.find(
+                (p) => p.name.toLowerCase() === key.toLowerCase()
+              );
+              normalizedProps[match ? match.name : key] = String(value);
+            }
+            return {
+              contractName: i.contractName,
+              props: normalizedProps,
+              coordinate: i.coordinate
+            };
+          }),
+          carryForwards: {}
+        };
       }
     }
   }
-  return hasResults ? viewStates : void 0;
-}
-function resolvePathValue(obj, path2) {
-  return path2.split(".").reduce((current, segment) => current?.[segment], obj);
-}
-function resolveBinding(binding, item) {
-  const match = binding.match(/^\{(.+)\}$/);
-  if (match) {
-    return String(item[match[1]] ?? "");
-  }
-  return binding;
+  return { preRenderedJayHtml, instancePhaseData, forEachInstances };
 }
-async function materializeDynamicContracts(projectRootFolder, buildFolder, viteServer) {
+async function materializeDynamicContracts(projectRootFolder, viteServer) {
   try {
     const services = getServiceRegistry();
     const result = await materializeContracts(
       {
         projectRoot: projectRootFolder,
-        outputDir: path__default.join(buildFolder, "materialized-contracts"),
+        outputDir: path__default.join(projectRootFolder, "agent-kit", "materialized-contracts"),
         verbose: false,
         viteServer
       },
@@ -2544,14 +2411,19 @@ async function materializeDynamicContracts(projectRootFolder, buildFolder, viteS
 }
 async function mkDevServer(rawOptions) {
   const options = defaults(rawOptions);
-  const {
-    publicBaseUrlPath,
-    pagesRootFolder,
-    projectRootFolder,
-    buildFolder,
-    jayRollupConfig,
-    dontCacheSlowly
-  } = options;
+  const { publicBaseUrlPath, pagesRootFolder, projectRootFolder, buildFolder, jayRollupConfig } = options;
+  if (buildFolder) {
+    try {
+      const entries = await fs$1.readdir(buildFolder);
+      for (const entry of entries) {
+        if (entry !== "pre-rendered") {
+          await fs$1.rm(path__default.join(buildFolder, entry), { recursive: true, force: true }).catch(() => {
+          });
+        }
+      }
+    } catch {
+    }
+  }
   const viteLogLevel = options.logLevel === "silent" ? "silent" : options.logLevel === "verbose" ? "info" : "warn";
   const lifecycleManager = new ServiceLifecycleManager(projectRootFolder);
   setupGracefulShutdown(lifecycleManager);
@@ -2564,12 +2436,13 @@ async function mkDevServer(rawOptions) {
   });
   lifecycleManager.setViteServer(vite);
   await lifecycleManager.initialize();
-  await materializeDynamicContracts(projectRootFolder, buildFolder, vite);
+  await materializeDynamicContracts(projectRootFolder, vite);
   setupServiceHotReload(vite, lifecycleManager);
   setupActionRouter(vite);
-  const routes = await initRoutes(pagesRootFolder);
-  const slowlyPhase = new DevSlowlyChangingPhase(dontCacheSlowly);
-  const slowRenderCacheDir = path__default.join(buildFolder, "slow-render-cache");
+  const allRoutes = await initRoutes(pagesRootFolder);
+  const routes = buildFolder ? allRoutes.filter((route) => !route.jayHtmlPath.startsWith(buildFolder)) : allRoutes;
+  const slowlyPhase = new DevSlowlyChangingPhase();
+  const slowRenderCacheDir = path__default.join(buildFolder, "pre-rendered");
   const slowRenderCache = new SlowRenderCache(slowRenderCacheDir, pagesRootFolder);
   setupSlowRenderCacheInvalidation(vite, slowRenderCache, pagesRootFolder);
   const projectInit = lifecycleManager.getProjectInit() ?? void 0;
@@ -2636,6 +2509,7 @@ function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder) {
       return;
     }
     if (changedPath.endsWith(".jay-html")) {
+      invalidateServerElementCache(changedPath);
       cache.invalidate(changedPath).then(() => {
         getLogger().info(`[SlowRender] Cache invalidated for ${changedPath}`);
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/dev-server",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "type": "module",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -16,31 +16,35 @@
     "build:check-types": "tsc",
     "test-definitions": "jay-cli definitions test",
     "test-runtime": "jay-cli runtime test",
+    "serve-fixture": "npx tsx test/serve-fixture.ts",
     "clean": "rimraf dist",
     "confirm": "npm run clean && npm run build && npm run build:check-types && npm run test",
     "test": "vitest run",
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-stack": "^0.13.0",
-    "@jay-framework/compiler-shared": "^0.13.0",
-    "@jay-framework/component": "^0.13.0",
-    "@jay-framework/fullstack-component": "^0.13.0",
-    "@jay-framework/logger": "^0.13.0",
-    "@jay-framework/runtime": "^0.13.0",
-    "@jay-framework/stack-client-runtime": "^0.13.0",
-    "@jay-framework/stack-route-scanner": "^0.13.0",
-    "@jay-framework/stack-server-runtime": "^0.13.0",
-    "@jay-framework/view-state-merge": "^0.13.0",
+    "@jay-framework/compiler-jay-stack": "^0.15.0",
+    "@jay-framework/compiler-shared": "^0.15.0",
+    "@jay-framework/component": "^0.15.0",
+    "@jay-framework/fullstack-component": "^0.15.0",
+    "@jay-framework/logger": "^0.15.0",
+    "@jay-framework/runtime": "^0.15.0",
+    "@jay-framework/stack-client-runtime": "^0.15.0",
+    "@jay-framework/stack-route-scanner": "^0.15.0",
+    "@jay-framework/stack-server-runtime": "^0.15.0",
+    "@jay-framework/view-state-merge": "^0.15.0",
     "vite": "^5.0.11"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.13.0",
-    "@jay-framework/jay-cli": "^0.13.0",
-    "@jay-framework/stack-client-runtime": "^0.13.0",
+    "@jay-framework/dev-environment": "^0.15.0",
+    "@jay-framework/jay-cli": "^0.15.0",
+    "@jay-framework/stack-client-runtime": "^0.15.0",
+    "@playwright/test": "^1.58.2",
     "@types/express": "^5.0.2",
     "@types/node": "^22.15.21",
+    "jsdom": "^23.2.0",
     "nodemon": "^3.0.3",
+    "playwright": "^1.58.2",
     "replace-in-file": "^7.1.0",
     "rimraf": "^5.0.5",
     "tsup": "^8.0.1",