@jay-framework/dev-server 0.15.4 → 0.15.6

package/dist/index.js

@@ -10,13 +10,12 @@ 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, resolveHeadlessInstances } from "@jay-framework/compiler-jay-html";
+import { JAY_IMPORT_RESOLVER, injectHeadfullFSTemplates, parseContract, slowRenderTransform, discoverHeadlessInstances, assignCoordinatesToJayHtml, 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, clearServerElementCache, getServiceRegistry, materializeContracts, loadPageParts, renderFastChangingData, generateClientScript, getClientInitData, generateSSRPageHtml, validateForEachInstances, slowRenderInstances } from "@jay-framework/stack-server-runtime";
+import { discoverPluginsWithInit, sortPluginsByDependencies, executePluginServerInits, runInitCallbacks, actionRegistry, discoverAndRegisterActions, discoverAllPluginActions, runShutdownCallbacks, clearLifecycleCallbacks, clearServiceRegistry, clearClientInitData, DevSlowlyChangingPhase, SlowRenderCache, preparePluginClientInits, clearServerElementCache, getServiceRegistry, materializeContracts, loadPageParts, renderFastChangingData, mergeHeadTags, 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, {
@@ -1201,7 +1200,7 @@ function createPluginClientImportResolver(options = {}) {
   const pluginDetector = options.pluginDetector || createDefaultPluginDetector();
   return {
     name: "jay-stack:plugin-client-import",
-    enforce: "pre",
+    enforce: "post",
     configResolved(config) {
       projectRoot = config.root || projectRoot;
       isSSRBuild = !!config.build?.ssr;
@@ -1366,8 +1365,6 @@ async function createViteServer(options) {
     clearScreen = true,
     httpServer
   } = 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: {
@@ -1383,8 +1380,6 @@ 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
@@ -1400,13 +1395,6 @@ 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) {
@@ -1766,6 +1754,10 @@ function createActionRouter(options) {
       });
       return;
     }
+    const timing = getDevLogger()?.startRequest(
+      requestMethod,
+      ACTION_ENDPOINT_BASE + "/" + actionName
+    );
     const result = await registry.execute(actionName, input);
     if (requestMethod === "GET" && result.success) {
       const cacheHeaders = registry.getCacheHeaders(actionName);
@@ -1785,6 +1777,7 @@ function createActionRouter(options) {
         error: result.error
       });
     }
+    timing?.end();
   };
 }
 function getStatusCodeForError(code, isActionError) {
@@ -1838,6 +1831,8 @@ function actionBodyParser() {
     });
   };
 }
+let _watchLinkedFiles = () => {
+};
 async function initRoutes(pagesBaseFolder) {
   return await scanRoutes(pagesBaseFolder, {
     jayHtmlFilename: "page.jay-html",
@@ -1861,7 +1856,9 @@ function defaults(options) {
     disableSSR: options.disableSSR,
     jayRollupConfig: {
       ...options.jayRollupConfig || {},
-      tsConfigFilePath
+      tsConfigFilePath,
+      pagesRoot: pagesRootFolder,
+      buildFolder
     },
     httpServer: options.httpServer
   };
@@ -2001,7 +1998,14 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     timing?.end();
     return;
   }
-  const { parts: pageParts, clientTrackByMap, usedPackages } = pagePartsResult.val;
+  const {
+    parts: pageParts,
+    clientTrackByMap,
+    usedPackages,
+    linkedCssFiles,
+    linkedComponentFiles
+  } = pagePartsResult.val;
+  _watchLinkedFiles([...linkedCssFiles || [], ...linkedComponentFiles || []]);
   const pluginsForPage = filterPluginsForPage(
     allPluginClientInits,
     allPluginsWithInit,
@@ -2030,6 +2034,7 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
   }
   const fastViewState = renderedFast.rendered;
   const fastCarryForward = renderedFast.carryForward;
+  const headTags = renderedFast.headTags ?? mergeHeadTags(cachedEntry.carryForward?.__slowHeadTags ?? []);
   await sendResponse(
     vite,
     res,
@@ -2045,7 +2050,8 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     options,
     cachedEntry.slowViewState,
     timing,
-    cachedEntry.preRenderedContent
+    cachedEntry.preRenderedContent,
+    headTags
   );
 }
 async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRenderCache, pageParams, pageProps, allPluginClientInits, allPluginsWithInit, projectInit, res, url, timing, query = {}) {
@@ -2064,6 +2070,8 @@ async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRen
     timing?.end();
     return;
   }
+  const { linkedCssFiles: initCss, linkedComponentFiles: initComps } = initialPartsResult.val;
+  _watchLinkedFiles([...initCss || [], ...initComps || []]);
   const slowStart = Date.now();
   const renderedSlowly = await slowlyPhase.runSlowlyForPage(
     pageParams,
@@ -2081,11 +2089,13 @@ async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRen
     timing?.end();
     return;
   }
+  const partKeys = initialPartsResult.val.parts.map((p) => p.key).filter((k) => !!k);
   const preRenderResult = await preRenderJayHtml(
     route,
     renderedSlowly.rendered,
     initialPartsResult.val.headlessContracts,
-    initialPartsResult.val.headlessInstanceComponents
+    initialPartsResult.val.headlessInstanceComponents,
+    partKeys
   );
   timing?.recordSlowRender(Date.now() - slowStart);
   if (!preRenderResult) {
@@ -2154,8 +2164,11 @@ async function handleClientOnlyRequest(vite, route, options, slowlyPhase, pagePa
     usedPackages,
     headlessInstanceComponents,
     discoveredInstances,
-    forEachInstances
+    forEachInstances,
+    linkedCssFiles,
+    linkedComponentFiles
   } = pagePartsResult.val;
+  _watchLinkedFiles([...linkedCssFiles || [], ...linkedComponentFiles || []]);
   const pluginsForPage = filterPluginsForPage(
     allPluginClientInits,
     allPluginsWithInit,
@@ -2229,7 +2242,7 @@ 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, slowViewState, timing, preLoadedContent) {
+async function sendResponse(vite, res, url, jayHtmlPath, sourceJayHtmlPath, pageParts, viewState, carryForward, clientTrackByMap, projectInit, pluginsForPage, options, slowViewState, timing, preLoadedContent, headTags) {
   let pageHtml;
   const routeDir = path__default.dirname(path__default.relative(options.pagesRootFolder, sourceJayHtmlPath));
   try {
@@ -2258,7 +2271,10 @@ async function sendResponse(vite, res, url, jayHtmlPath, sourceJayHtmlPath, page
       {
         enableAutomation: !options.disableAutomation,
         slowViewState
-      }
+      },
+      // Pass source directory for headfull FS file resolution when using pre-rendered path
+      jayHtmlDir !== sourceDir ? sourceDir : void 0,
+      headTags
     );
   } catch (err) {
     getLogger().warn(`[SSR] Failed, falling back to client rendering: ${err.message}`);
@@ -2289,7 +2305,7 @@ async function sendResponse(vite, res, url, jayHtmlPath, sourceJayHtmlPath, page
   res.status(200).set({ "Content-Type": "text/html" }).send(compiledPageHtml);
   timing?.end();
 }
-async function preRenderJayHtml(route, slowViewState, headlessContracts, headlessInstanceComponents) {
+async function preRenderJayHtml(route, slowViewState, headlessContracts, headlessInstanceComponents, partKeys = []) {
   const jayHtmlContent = await fs$1.readFile(route.jayHtmlPath, "utf-8");
   const contractPath = route.jayHtmlPath.replace(".jay-html", ".jay-contract");
   let contract;
@@ -2310,7 +2326,8 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
       return void 0;
     }
   }
-  if (!contract && slowViewState && Object.keys(slowViewState).length > 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.`
     );
@@ -2342,10 +2359,15 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
   let forEachInstances;
   if (headlessInstanceComponents.length > 0) {
     const discoveryResult = discoverHeadlessInstances(preRenderedJayHtml);
-    preRenderedJayHtml = discoveryResult.preRenderedJayHtml;
-    if (discoveryResult.forEachInstances.length > 0) {
+    const htmlWithRefs = discoveryResult.preRenderedJayHtml;
+    const headlessContractNameSet = new Set(
+      headlessInstanceComponents.map((c2) => c2.contractName)
+    );
+    preRenderedJayHtml = assignCoordinatesToJayHtml(htmlWithRefs, headlessContractNameSet);
+    const finalDiscovery = discoverHeadlessInstances(preRenderedJayHtml);
+    if (finalDiscovery.forEachInstances.length > 0) {
       const validationErrors = validateForEachInstances(
-        discoveryResult.forEachInstances,
+        finalDiscovery.forEachInstances,
         headlessInstanceComponents
       );
       if (validationErrors.length > 0) {
@@ -2354,11 +2376,11 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
         );
         return void 0;
       }
-      forEachInstances = discoveryResult.forEachInstances;
+      forEachInstances = finalDiscovery.forEachInstances;
     }
-    if (discoveryResult.instances.length > 0) {
+    if (finalDiscovery.instances.length > 0) {
       const slowResult = await slowRenderInstances(
-        discoveryResult.instances,
+        finalDiscovery.instances,
         headlessInstanceComponents
       );
       if (slowResult) {
@@ -2430,16 +2452,8 @@ async function mkDevServer(rawOptions) {
   const options = defaults(rawOptions);
   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 {
-    }
+    await fs$1.rm(buildFolder, { recursive: true, force: true }).catch(() => {
+    });
   }
   const viteLogLevel = options.logLevel === "silent" ? "silent" : options.logLevel === "verbose" ? "info" : "warn";
   const lifecycleManager = new ServiceLifecycleManager(projectRootFolder);
@@ -2462,7 +2476,11 @@ async function mkDevServer(rawOptions) {
   const slowlyPhase = new DevSlowlyChangingPhase();
   const slowRenderCacheDir = path__default.join(buildFolder, "pre-rendered");
   const slowRenderCache = new SlowRenderCache(slowRenderCacheDir, pagesRootFolder);
-  setupSlowRenderCacheInvalidation(vite, slowRenderCache, pagesRootFolder);
+  _watchLinkedFiles = setupSlowRenderCacheInvalidation(
+    vite,
+    slowRenderCache,
+    pagesRootFolder
+  );
   const projectInit = lifecycleManager.getProjectInit() ?? void 0;
   const pluginsWithInit = lifecycleManager.getPluginsWithInit();
   const pluginClientInits = preparePluginClientInits(pluginsWithInit);
@@ -2521,19 +2539,39 @@ function setupActionRouter(vite) {
   vite.middlewares.use(ACTION_ENDPOINT_BASE, createActionRouter());
   getLogger().info(`[Actions] Action router mounted at ${ACTION_ENDPOINT_BASE}`);
 }
-function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder) {
+function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder, projectRootFolder) {
+  const watchedFiles = /* @__PURE__ */ new Set();
+  const watchLinkedFiles = (files) => {
+    for (const file of files) {
+      if (watchedFiles.has(file))
+        continue;
+      watchedFiles.add(file);
+      vite.watcher.add(file);
+      getLogger().info(`[SlowRender] Watching: ${file}`);
+    }
+  };
   vite.watcher.on("change", (changedPath) => {
-    if (!changedPath.startsWith(pagesRootFolder)) {
+    if (watchedFiles.has(changedPath)) {
+      clearServerElementCache();
+      cache.clear().then(() => {
+        getLogger().info(
+          `[SlowRender] Cache cleared (linked file changed: ${changedPath})`
+        );
+        vite.ws.send({ type: "full-reload" });
+      });
       return;
     }
-    if (changedPath.endsWith(".jay-html")) {
+    if (changedPath.endsWith(".jay-html") && changedPath.startsWith(pagesRootFolder)) {
       clearServerElementCache();
-      cache.invalidate(changedPath).then(() => {
-        getLogger().info(`[SlowRender] Cache invalidated for ${changedPath}`);
+      cache.clear().then(() => {
+        getLogger().info(`[SlowRender] Cache cleared (jay-html changed: ${changedPath})`);
         vite.ws.send({ type: "full-reload" });
       });
       return;
     }
+    if (!changedPath.startsWith(pagesRootFolder)) {
+      return;
+    }
     if (changedPath.endsWith("page.ts")) {
       const dir = path__default.dirname(changedPath);
       const jayHtmlPath = path__default.join(dir, "page.jay-html");
@@ -2558,6 +2596,7 @@ function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder) {
       return;
     }
   });
+  return watchLinkedFiles;
 }
 export {
   ACTION_ENDPOINT_BASE,

package/package.json

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