@jay-framework/production-server 0.22.2 → 0.23.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { B as BuildOptions, R as RouteManifest, a as RouteEntry } from './serve-index-lg6huJYm.js';
-export { A as ActionEntry, e as ArtifactStore, c as BuildMetadata, C as CacheEntry, F as FilesystemArtifactStore, I as InstanceEntry, M as MatchResult, d as PageModule, P as PluginEntry, n as PreImportedPlugin, b as RouteSegment, S as ServerElementModule, g as fetchActionRequest, f as fetchPageRequest, j as fetchStaticFile, k as initializeServices, l as initializeServicesFromModules, i as isActionRequest, m as matchRequest, r as registerActionsFromManifest, h as registerActionsFromModules } from './serve-index-lg6huJYm.js';
+import { B as BuildOptions, R as RouteManifest, a as RouteEntry } from './serve-index-Ccw8CNDg.js';
+export { A as ActionEntry, b as ArtifactStore, c as BuildMetadata, C as CacheEntry, F as FilesystemArtifactStore, I as InstanceEntry, M as MatchResult, P as PageModule, d as PluginEntry, e as PreImportedPlugin, f as RouteSegment, S as ServerElementModule, g as fetchActionRequest, h as fetchPageRequest, i as fetchStaticFile, j as initializeServices, k as initializeServicesFromModules, l as isActionRequest, m as matchRequest, r as registerActionsFromManifest, n as registerActionsFromModules } from './serve-index-Ccw8CNDg.js';
 import '@jay-framework/ssr-runtime';
 import '@jay-framework/compiler-shared';
 import '@jay-framework/stack-server-runtime';

package/dist/index.js

@@ -6,8 +6,8 @@ import path from "node:path";
 import fs from "node:fs/promises";
 import { createRequire } from "node:module";
 import { DevSlowlyChangingPhase, slowRenderInstances, scanPlugins, runLoadParams, parseCookies } from "@jay-framework/stack-server-runtime";
-import { l as loadProductionPageParts, g as buildPagePartsConfig, d as initializeServices, r as registerActionsFromManifest, i as isActionRequest, a as fetchActionRequest, c as fetchStaticFile, m as matchRequest, f as fetchPageRequest, F as FilesystemArtifactStore } from "./init-services-zmGSxSck.js";
-import { e, b } from "./init-services-zmGSxSck.js";
+import { l as loadProductionPageParts, g as buildPagePartsConfig, F as FilesystemArtifactStore, i as initializeServices, r as registerActionsFromManifest, d as isActionRequest, f as fetchActionRequest, b as fetchStaticFile, m as matchRequest, a as fetchPageRequest } from "./init-services-BVEuyIVG.js";
+import { c, e } from "./init-services-BVEuyIVG.js";
 import crypto, { createHash } from "node:crypto";
 import fs$1 from "node:fs";
 import { jayRuntime } from "@jay-framework/vite-plugin";
@@ -18,8 +18,6 @@ import { transform } from "esbuild";
 import http from "node:http";
 import { Readable } from "node:stream";
 import { isJayWebhook } from "@jay-framework/fullstack-component";
-import "@jay-framework/view-state-merge";
-import "@jay-framework/ssr-runtime";
 async function discoverServerEntries(projectRoot, pagesRoot) {
   const logger = getLogger();
   const routes = await scanRoutes(pagesRoot, {
@@ -51,8 +49,7 @@ async function discoverServerEntries(projectRoot, pagesRoot) {
     try {
       const dirs = await fs.readdir(scanDir, { withFileTypes: true });
       for (const dir of dirs) {
-        if (!dir.isDirectory())
-          continue;
+        if (!dir.isDirectory()) continue;
         const dirPath = path.join(scanDir, dir.name);
         const files = await fs.readdir(dirPath);
         for (const file of files) {
@@ -194,8 +191,7 @@ async function parseViteManifest(outputDir, packages) {
   }
   const manifest = {};
   for (const [, entry] of Object.entries(raw)) {
-    if (!entry.isEntry)
-      continue;
+    if (!entry.isEntry) continue;
     const outputBase = path.basename(entry.file, ".js");
     for (const [varName, pkg] of varNameToPackage) {
       if (outputBase.startsWith(varName)) {
@@ -218,8 +214,7 @@ function hashParams(params, suffix) {
     {}
   );
   const json = JSON.stringify(sorted);
-  if (json === "{}" && !suffix)
-    return "";
+  if (json === "{}" && !suffix) return "";
   const input = suffix ? json + ":" + suffix : json;
   return "_" + crypto.createHash("md5").update(input).digest("hex").substring(0, 8);
 }
@@ -245,36 +240,32 @@ async function buildInstance(route, params, pageModule, ctx, routeServerElementP
   );
   const contracts = [
     .../* @__PURE__ */ new Set([
-      ...pageParts.headlessInstanceComponents.map((c) => c.contractName),
+      ...pageParts.headlessInstanceComponents.map((c2) => c2.contractName),
       ...pageParts.parts.filter((p) => p.contractInfo?.contractName).map((p) => p.contractInfo.contractName)
     ])
   ];
   const pagePartsConfigPath = path.join(backendInstanceDir, "page-parts.json");
-  try {
-    await fs.access(pagePartsConfigPath);
-  } catch {
-    const exportName = route.componentExport || "page";
-    let pageServerModule = "";
-    let pageIsPlugin = false;
-    if (route.compPath) {
-      if (route.componentExport) {
-        pageServerModule = route.packageName || route.compPath;
-        pageIsPlugin = true;
-      } else {
-        const relativePath = path.relative(ctx.projectRoot, route.compPath);
-        pageServerModule = relativePath.replace(/^src\//, "server/").replace(/\.ts$/, ".js").replace(/\[/g, "_").replace(/\]/g, "_");
-      }
+  const exportName = route.componentExport || "page";
+  let pageServerModule = "";
+  let pageIsPlugin = false;
+  if (route.compPath) {
+    if (route.componentExport) {
+      pageServerModule = route.packageName || route.compPath;
+      pageIsPlugin = true;
+    } else {
+      const relativePath = path.relative(ctx.projectRoot, route.compPath);
+      pageServerModule = relativePath.replace(/^src\//, "server/").replace(/\.ts$/, ".js").replace(/\[/g, "_").replace(/\]/g, "_");
     }
-    const config = buildPagePartsConfig(
-      pageParts,
-      pageServerModule,
-      exportName,
-      ctx.backendDir,
-      pageIsPlugin
-    );
-    await fs.writeFile(pagePartsConfigPath, JSON.stringify(config, null, 2));
-    logger.info(`[Build] Page parts config: ${routeDir}/page-parts.json`);
   }
+  const config = buildPagePartsConfig(
+    pageParts,
+    pageServerModule,
+    exportName,
+    ctx.backendDir,
+    pageIsPlugin
+  );
+  await fs.writeFile(pagePartsConfigPath, JSON.stringify(config, null, 2));
+  logger.info(`[Build] Page parts config: ${routeDir}/page-parts.json`);
   const slowPhase = new DevSlowlyChangingPhase();
   const slowResult = await slowPhase.runSlowlyForPage(
     params,
@@ -377,7 +368,8 @@ function buildRouteEntry(route, serverModulePath) {
     segments: convertSegments(route.segments),
     serverModule: serverModulePath,
     componentExport: route.componentExport,
-    instances: []
+    instances: [],
+    ...route.devOnly && { devOnly: true }
   };
 }
 async function discoverActions(actionPaths, serverOutputDir, buildDir, projectRoot) {
@@ -404,8 +396,7 @@ async function discoverActions(actionPaths, serverOutputDir, buildDir, projectRo
   try {
     const scannedPlugins = await scanPlugins({ projectRoot });
     for (const [packageName, plugin] of scannedPlugins) {
-      if (plugin.isLocal)
-        continue;
+      if (plugin.isLocal) continue;
       plugins.push({ name: plugin.manifest.name, packageName });
       const pluginActions = plugin.manifest.actions;
       if (pluginActions && pluginActions.length > 0) {
@@ -441,10 +432,8 @@ async function scanPluginRoutes(projectRoot, projectRoutes) {
   const projectPaths = new Set(projectRoutes.map((r) => r.rawRoute));
   const pluginRoutes = [];
   for (const [, plugin] of plugins) {
-    if (plugin.isLocal)
-      continue;
-    if (!plugin.manifest.routes)
-      continue;
+    if (plugin.isLocal) continue;
+    if (!plugin.manifest.routes) continue;
     for (const route of plugin.manifest.routes) {
       if (projectPaths.has(route.path)) {
         logger.info(
@@ -467,9 +456,12 @@ async function scanPluginRoutes(projectRoot, projectRoutes) {
         jayHtmlPath,
         compPath,
         componentExport,
-        packageName: plugin.packageName
+        packageName: plugin.packageName,
+        ...route.devOnly === true && { devOnly: true }
       });
-      logger.info(`[Routes] Plugin "${plugin.manifest.name}" provides route ${route.path}`);
+      logger.info(
+        `[Routes] Plugin "${plugin.manifest.name}" provides route ${route.path}${route.devOnly ? " (dev-only)" : ""}`
+      );
     }
   }
   return pluginRoutes;
@@ -484,8 +476,7 @@ function resolvePluginExport(pluginPath, exportSubpath) {
       const exportValue = packageJson.exports[exportKey];
       if (exportValue) {
         const resolved = typeof exportValue === "string" ? exportValue : exportValue.default || exportValue.import || exportValue.require;
-        if (resolved)
-          return path.join(pluginPath, resolved);
+        if (resolved) return path.join(pluginPath, resolved);
       }
     }
   } catch {
@@ -508,8 +499,7 @@ function resolvePluginModule(pluginPath) {
     const mainPath = typeof mainExport === "string" ? mainExport : mainExport?.default || mainExport?.import || pkg.main;
     if (mainPath) {
       const resolved = path.join(pluginPath, mainPath);
-      if (fs$1.existsSync(resolved))
-        return resolved;
+      if (fs$1.existsSync(resolved)) return resolved;
     }
   } catch {
   }
@@ -558,14 +548,11 @@ async function compileServerElement(jayHtmlContent, jayHtmlFilename, jayHtmlDir,
   const css = parsedJayFile.css;
   if (css) {
     cssImports = extractCssImportUrls(css);
-    const cssFilename = path.basename(outputPath, ".server-element.js") + ".css";
-    const cssPath = path.join(outputDir, cssFilename);
-    if (minifyCss) {
-      const minified = await transform(css, { loader: "css", minify: true });
-      await fs.writeFile(cssPath, minified.code, "utf-8");
-    } else {
-      await fs.writeFile(cssPath, css, "utf-8");
-    }
+    const cssContent = minifyCss ? (await transform(css, { loader: "css", minify: true })).code : css;
+    const hash = createHash("sha256").update(cssContent).digest("hex").slice(0, 8);
+    const baseName = path.basename(outputPath, ".server-element.js");
+    const cssFilename = `${baseName}-${hash}.css`;
+    await fs.writeFile(path.join(outputDir, cssFilename), cssContent, "utf-8");
     cssFile = cssFilename;
   }
   getLogger().info(`[Build] Compiled server element: ${path.basename(outputPath)}`);
@@ -636,8 +623,7 @@ async function compileRouteHydrateScript(jayHtmlPath, outputDir, projectRoot, ts
   const manifest = JSON.parse(await fs.readFile(manifestPath, "utf-8"));
   await fs.rm(manifestPath, { force: true });
   const entryKey = Object.keys(manifest).find((k) => manifest[k].isEntry);
-  if (!entryKey)
-    throw new Error("No entry in route hydrate manifest");
+  if (!entryKey) throw new Error("No entry in route hydrate manifest");
   const jsFile = manifest[entryKey].file;
   getLogger().info(`[Build] Compiled route hydrate script: ${jsFile}`);
   return { jsFile };
@@ -652,8 +638,7 @@ function resolveJayHtmlPaths(html, sourceDir, targetDir) {
     if (val && (val.startsWith("./") || val.startsWith("../"))) {
       const abs = path.resolve(sourceDir, val);
       let rel = path.relative(targetDir, abs);
-      if (!rel.startsWith("."))
-        rel = "./" + rel;
+      if (!rel.startsWith(".")) rel = "./" + rel;
       el.setAttribute(attr, rel);
     }
   };
@@ -784,10 +769,8 @@ async function buildInstanceClient(hydrateEntryPath, instanceId, outputDir, proj
   return result;
 }
 function crossProductParams(parts) {
-  if (parts.length === 0)
-    return [];
-  if (parts.length === 1)
-    return parts[0].values;
+  if (parts.length === 0) return [];
+  if (parts.length === 1) return parts[0].values;
   const logger = getLogger();
   for (let i = 0; i < parts.length; i++) {
     for (let j = i + 1; j < parts.length; j++) {
@@ -805,8 +788,8 @@ function crossProductParams(parts) {
     const next = parts[i].values;
     const combined = [];
     for (const a of result) {
-      for (const b2 of next) {
-        combined.push({ ...a, ...b2 });
+      for (const b of next) {
+        combined.push({ ...a, ...b });
       }
     }
     result = combined;
@@ -815,8 +798,7 @@ function crossProductParams(parts) {
 }
 function paramsMatchInferred(params, inferredParams, optionalSegments) {
   return Object.entries(inferredParams).every(([k, v]) => {
-    if (optionalSegments?.has(k))
-      return true;
+    if (optionalSegments?.has(k)) return true;
     return params[k] === v;
   });
 }
@@ -829,10 +811,8 @@ function computeSpecificity(route) {
 function buildUrl(route, params) {
   return route.rawRoute.replace(/\[\[(\w+)\]\]/g, (_, name) => {
     const value = params[name];
-    if (!value)
-      return "";
-    if (route.inferredParams?.[name] === value)
-      return "";
+    if (!value) return "";
+    if (route.inferredParams?.[name] === value) return "";
     return value;
   }).replace(/\[(\w+)\]/g, (_, name) => params[name] || "").replace(/\/\/+/g, "/").replace(/\/$/, "") || "/";
 }
@@ -889,8 +869,7 @@ async function discoverPluginClientPackages(projectRoot) {
   const seen = /* @__PURE__ */ new Set();
   const result = [];
   async function walk(pkgName) {
-    if (seen.has(pkgName))
-      return;
+    if (seen.has(pkgName)) return;
     seen.add(pkgName);
     try {
       const mainPath = projectRequire.resolve(pkgName);
@@ -1026,8 +1005,7 @@ async function buildVersion(options) {
       await discoverPluginsWithInit({ projectRoot: options.projectRoot })
     );
     for (const pluginInit of allPluginsWithInit) {
-      if (pluginInit.isLocal)
-        continue;
+      if (pluginInit.isLocal) continue;
       const clientImportPath = `${pluginInit.packageName}/client`;
       try {
         const clientModule = await import(clientImportPath);
@@ -1092,10 +1070,8 @@ async function buildVersion(options) {
     logger.important(`[Build] ${instanceCount}/${totalExpected} ${routeName}${paramStr}`);
   }
   async function loadPageModule(entry) {
-    if (!entry.serverModule)
-      return {};
-    if (entry.isPlugin)
-      return import(entry.serverModule);
+    if (!entry.serverModule) return {};
+    if (entry.isPlugin) return import(entry.serverModule);
     return import(path.join(backendDir, entry.serverModule));
   }
   const routeInfos = routeEntries.map((re) => {
@@ -1111,8 +1087,7 @@ async function buildVersion(options) {
   const loadParamsCache = /* @__PURE__ */ new Map();
   const loadParamsResults = /* @__PURE__ */ new Map();
   for (const info of routeInfos) {
-    if (!info.hasDynamicParams)
-      continue;
+    if (!info.hasDynamicParams) continue;
     const { route, entry } = info.routeEntry;
     let pageModule;
     try {
@@ -1130,12 +1105,12 @@ async function buildVersion(options) {
       serverOutputDir
     );
     const partsWithLoadParams = pageParts.parts.filter((p) => p.compDefinition?.loadParams);
-    if (partsWithLoadParams.length === 0)
-      continue;
+    if (partsWithLoadParams.length === 0) continue;
     const paramParts = [];
     for (const part of partsWithLoadParams) {
-      const fn = part.compDefinition.loadParams;
-      if (!loadParamsCache.has(fn)) {
+      const propsKey = JSON.stringify(part.headlessProps ?? {});
+      const cacheKey = `${part.key ?? ""}:${propsKey}`;
+      if (!loadParamsCache.has(cacheKey)) {
         logger.important(`[Build] Loading params for ${route.rawRoute}...`);
         const partParams = [];
         let batchIndex = 0;
@@ -1146,9 +1121,9 @@ async function buildVersion(options) {
             logger.important(`[Build]   ...${partParams.length} params so far`);
           }
         }
-        loadParamsCache.set(fn, partParams);
+        loadParamsCache.set(cacheKey, partParams);
       }
-      const cached = loadParamsCache.get(fn);
+      const cached = loadParamsCache.get(cacheKey);
       const keys = new Set(cached.flatMap((p) => Object.keys(p)));
       paramParts.push({ keys, values: cached });
     }
@@ -1160,14 +1135,12 @@ async function buildVersion(options) {
   const byRoute = /* @__PURE__ */ new Map();
   for (const materialized2 of deduped) {
     const info = materialized2.route;
-    if (!byRoute.has(info))
-      byRoute.set(info, []);
+    if (!byRoute.has(info)) byRoute.set(info, []);
     byRoute.get(info).push(materialized2.params);
   }
   for (const [info] of byRoute) {
     const { route, entry } = info.routeEntry;
-    if (!route.jayHtmlPath)
-      continue;
+    if (!route.jayHtmlPath) continue;
     const routeDir = route.rawRoute.replace(/^\//, "") || "index";
     const frontendSafeRouteDir = routeDir.replace(/\[/g, "%5B").replace(/\]/g, "%5D");
     const backendRouteDir = path.join(backendDir, "pre-rendered", routeDir);
@@ -1356,8 +1329,7 @@ function toFetchRequest(req) {
   const url = new URL(req.url || "/", `http://${req.headers.host}`);
   const headers = new Headers();
   for (const [key, value] of Object.entries(req.headers)) {
-    if (value)
-      headers.set(key, Array.isArray(value) ? value.join(", ") : value);
+    if (value) headers.set(key, Array.isArray(value) ? value.join(", ") : value);
   }
   const init = { method: req.method, headers };
   if (req.method !== "GET" && req.method !== "HEAD") {
@@ -1377,8 +1349,7 @@ async function pipeFetchResponse(response, res) {
     try {
       while (true) {
         const { done, value } = await reader.read();
-        if (done)
-          break;
+        if (done) break;
         res.write(value);
       }
     } finally {
@@ -1458,8 +1429,7 @@ async function startMainServer(options) {
       await pipeFetchResponse(response, res);
     } catch (err) {
       logger.error(`[Server] Error handling ${url.pathname}: ${err.message}`);
-      if (err.stack)
-        logger.error(err.stack);
+      if (err.stack) logger.error(err.stack);
       if (!res.headersSent) {
         res.writeHead(500);
         res.end("Internal Server Error");
@@ -1485,11 +1455,9 @@ async function discoverWebhooks(projectRoot, serverBuildDir) {
   try {
     const plugins = await scanPlugins({ projectRoot });
     for (const [packageName, plugin] of plugins) {
-      if (plugin.isLocal)
-        continue;
+      if (plugin.isLocal) continue;
       const declaredWebhooks = plugin.manifest.webhooks;
-      if (!declaredWebhooks || declaredWebhooks.length === 0)
-        continue;
+      if (!declaredWebhooks || declaredWebhooks.length === 0) continue;
       try {
         const pluginModule = await import(packageName);
         for (const entry of declaredWebhooks) {
@@ -1521,11 +1489,9 @@ async function discoverWebhooks(projectRoot, serverBuildDir) {
   try {
     const plugins = await scanPlugins({ projectRoot });
     for (const [, plugin] of plugins) {
-      if (!plugin.isLocal)
-        continue;
+      if (!plugin.isLocal) continue;
       const declaredWebhooks = plugin.manifest.webhooks;
-      if (!declaredWebhooks || declaredWebhooks.length === 0)
-        continue;
+      if (!declaredWebhooks || declaredWebhooks.length === 0) continue;
       const pluginDirName = path.basename(plugin.pluginPath);
       for (const entry of declaredWebhooks) {
         const exportName = typeof entry === "string" ? entry : entry.name;
@@ -1556,8 +1522,7 @@ async function discoverWebhooks(projectRoot, serverBuildDir) {
   try {
     const files = await fs.readdir(webhooksDir);
     for (const file of files) {
-      if (!file.endsWith(".js"))
-        continue;
+      if (!file.endsWith(".js")) continue;
       try {
         const mod = await import(path.join(webhooksDir, file));
         for (const [, value] of Object.entries(mod)) {
@@ -1740,10 +1705,8 @@ async function rebuildContract(options) {
   });
 }
 async function loadRouteModule(route, buildDir) {
-  if (!route.serverModule)
-    return {};
-  if (route.isPlugin)
-    return import(route.serverModule);
+  if (!route.serverModule) return {};
+  if (route.isPlugin) return import(route.serverModule);
   return import(path.join(buildDir, route.serverModule));
 }
 async function resolveJayRouteFromManifest(route, options) {
@@ -1763,8 +1726,7 @@ async function resolveJayRouteFromManifest(route, options) {
   return {
     rawRoute: route.pattern,
     segments: route.segments.map((s) => {
-      if (s.type === "static")
-        return s.value;
+      if (s.type === "static") return s.value;
       return { name: s.value, type: segmentTypeMap[s.type] };
     }),
     jayHtmlPath: resolvedJayHtmlPath,
@@ -1781,11 +1743,9 @@ function paramsMatch(instanceParams, targetParams) {
   return Object.entries(targetParams).every(([key, value]) => instanceParams[key] === value);
 }
 function collectInstanceFiles(instance) {
-  if (!instance.cachePath)
-    return [];
+  if (!instance.cachePath) return [];
   const files = [instance.cachePath, instance.serverElementPath, instance.clientBundlePath];
-  if (instance.clientCssPath)
-    files.push(instance.clientCssPath);
+  if (instance.clientCssPath) files.push(instance.clientCssPath);
   return files.filter(Boolean);
 }
 async function appendCleanupManifest(buildDir, files) {
@@ -1961,13 +1921,13 @@ export {
   fetchPageRequest,
   fetchStaticFile,
   initializeServices,
-  e as initializeServicesFromModules,
+  c as initializeServicesFromModules,
   isActionRequest,
   matchRequest,
   rebuild,
   rebuildContract,
   registerActionsFromManifest,
-  b as registerActionsFromModules,
+  e as registerActionsFromModules,
   resolveContractToRoutes,
   startMainServer,
   startRendererServer

package/dist/{init-services-zmGSxSck.js → init-services-BVEuyIVG.js}

@@ -1,9 +1,6 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import fs from "node:fs/promises";
 import path from "node:path";
 import { renderFastChangingData, headMetaToHeadTags, mergeHeadTags, serializeHeadTags, getClientInitData, actionRegistry, setClientInitData } from "@jay-framework/stack-server-runtime";
@@ -14,7 +11,7 @@ import { getLogger } from "@jay-framework/logger";
 import { parseJayFile, JAY_IMPORT_RESOLVER, injectHeadfullFSTemplates, assignCoordinatesToJayHtml, discoverHeadlessInstances } from "@jay-framework/compiler-jay-html";
 import { checkValidationErrors } from "@jay-framework/compiler-shared";
 import { isJayAction, isJayStreamAction } from "@jay-framework/fullstack-component";
-const require2 = createRequire(import.meta.url);
+const require$1 = createRequire(import.meta.url);
 async function loadProductionPageParts(route, pageModule, jayHtmlContent, projectRoot, tsConfigFilePath, serverBuildDir) {
   const exportName = route.componentExport || "page";
   const compDefinition = pageModule[exportName] ?? pageModule.default;
@@ -64,9 +61,14 @@ async function loadProductionPageParts(route, pageModule, jayHtmlContent, projec
     } else {
       modulePath = module;
     }
-    const resolvedModulePath = isLocalModule ? modulePath : require2.resolve(module, { paths: [dirName] });
-    const headlessModule = await import(resolvedModulePath);
-    const headlessCompDef = headlessModule[name];
+    let headlessCompDef;
+    if (headlessImport.structural) {
+      continue;
+    } else {
+      const resolvedModulePath = isLocalModule ? modulePath : require$1.resolve(module, { paths: [dirName] });
+      const headlessModule = await import(resolvedModulePath);
+      headlessCompDef = headlessModule[name];
+    }
     if (headlessImport.key) {
       const clientModulePath = isLocalModule ? path.resolve(dirName, module) : `${module}/client`;
       const ci = headlessImport.contract ? { contractName: headlessImport.contract.name, metadata: headlessImport.metadata } : void 0;
@@ -78,18 +80,22 @@ async function loadProductionPageParts(route, pageModule, jayHtmlContent, projec
         contractInfo: ci,
         headlessProps: headlessImport.headlessProps
       });
-      keyedPartModules.push({
-        key: headlessImport.key,
-        modulePath: clientModulePath,
-        exportName: name
-      });
+      const hasClientComp = !!headlessCompDef?.fastRender || !!headlessCompDef?.hasInteractive;
+      if (!headlessImport.structural && hasClientComp) {
+        keyedPartModules.push({
+          key: headlessImport.key,
+          modulePath: clientModulePath,
+          exportName: name
+        });
+      }
       headlessModuleInfos.push({
         modulePath,
         exportName: name,
         isLocal: isLocalModule,
         key: headlessImport.key,
         contractInfo: ci,
-        headlessProps: headlessImport.headlessProps
+        headlessProps: headlessImport.headlessProps,
+        structural: headlessImport.structural
       });
     }
     if (!headlessImport.key && headlessImport.contract) {
@@ -103,7 +109,8 @@ async function loadProductionPageParts(route, pageModule, jayHtmlContent, projec
         exportName: name,
         isLocal: isLocalModule,
         contractName: headlessImport.contractName,
-        propNames: headlessImport.contract.props?.map((p) => p.name) ?? []
+        propNames: headlessImport.contract.props?.map((p) => p.name) ?? [],
+        structural: headlessImport.structural
       });
     }
   }
@@ -163,11 +170,12 @@ function buildPagePartsConfig(pageParts, pageServerModule, pageExportName, build
   for (const info of pageParts.headlessModuleInfos) {
     if (info.contractName) {
       instanceComponents.push({
-        modulePath: info.isLocal ? path.relative(buildDir, info.modulePath) : info.modulePath,
+        modulePath: info.structural ? "" : info.isLocal ? path.relative(buildDir, info.modulePath) : info.modulePath,
         exportName: info.exportName,
         source: info.isLocal ? "local" : "npm",
         contractName: info.contractName,
-        propNames: info.propNames ?? []
+        propNames: info.propNames ?? [],
+        ...info.structural ? { structural: true } : {}
       });
     }
   }
@@ -207,10 +215,11 @@ async function loadPagePartsFromConfig(configPath, artifacts) {
   }
   const headlessInstanceComponents = [];
   for (const entry of config.instanceComponents) {
-    const mod = await importModule(entry);
     const serveTimeContract = {
       props: entry.propNames.map((name) => ({ name }))
     };
+    if (entry.structural) continue;
+    const mod = await importModule(entry);
     headlessInstanceComponents.push({
       contractName: entry.contractName,
       compDefinition: mod[entry.exportName] ?? mod.default,
@@ -283,8 +292,7 @@ class FilesystemArtifactStore {
         this.moduleCache.set(modulePath, { module: mod, mtime: stat.mtimeMs });
         return mod;
       } catch {
-        if (local)
-          throw new Error(`Local module not found: ${fullPath}`);
+        if (local) throw new Error(`Local module not found: ${fullPath}`);
       }
     }
     return import(modulePath);
@@ -314,8 +322,7 @@ function matchSegments(routeSegments, urlSegments) {
       }
       urlIdx++;
     } else if (seg.type === "param") {
-      if (urlIdx >= urlSegments.length)
-        return void 0;
+      if (urlIdx >= urlSegments.length) return void 0;
       params[seg.value] = urlSegments[urlIdx];
       urlIdx++;
     } else if (seg.type === "optional") {
@@ -324,8 +331,7 @@ function matchSegments(routeSegments, urlSegments) {
         urlIdx++;
       }
     } else if (seg.type === "catchAll") {
-      if (urlIdx >= urlSegments.length)
-        return void 0;
+      if (urlIdx >= urlSegments.length) return void 0;
       params[seg.value] = urlSegments.slice(urlIdx).join("/");
       urlIdx = urlSegments.length;
     } else if (seg.type === "optionalCatchAll") {
@@ -335,8 +341,7 @@ function matchSegments(routeSegments, urlSegments) {
       }
     }
   }
-  if (urlIdx !== urlSegments.length)
-    return void 0;
+  if (urlIdx !== urlSegments.length) return void 0;
   return params;
 }
 function findInstance(route, params) {
@@ -347,10 +352,8 @@ function findInstance(route, params) {
     for (const name of paramNames) {
       const urlVal = params[name];
       const instVal = instance.params[name];
-      if (urlVal === void 0 && instVal === void 0)
-        continue;
-      if (urlVal !== instVal)
-        return false;
+      if (urlVal === void 0 && instVal === void 0) continue;
+      if (urlVal !== instVal) return false;
     }
     return true;
   });
@@ -366,8 +369,7 @@ const pagePartsCache = /* @__PURE__ */ new Map();
 async function getPageParts(route, artifacts, cachePath) {
   const cacheKey = route.pattern;
   const cached = pagePartsCache.get(cacheKey);
-  if (cached)
-    return cached;
+  if (cached) return cached;
   const routeDir = path.dirname(cachePath);
   const configRelPath = path.join(routeDir, "page-parts.json");
   const parts = await loadPagePartsFromConfig(configRelPath, artifacts);
@@ -424,19 +426,27 @@ async function fetchPageRequest(match, manifest, requestUrl, artifacts, staticBa
     fastViewState,
     route.trackByMap || {}
   );
+  fullViewState.__jay = {
+    params: match.params,
+    url: { path: requestUrl.pathname }
+  };
   const headTagSources = [];
   const slowHeadTags = cf.__slowHeadTags;
-  if (slowHeadTags)
-    headTagSources.push(...slowHeadTags);
-  if (fastResult.headTags)
-    headTagSources.push(fastResult.headTags);
+  if (slowHeadTags) headTagSources.push(...slowHeadTags);
+  if (fastResult.headTags) headTagSources.push(fastResult.headTags);
   const templateHeadTags = headMetaToHeadTags(route.headMeta, fullViewState);
-  if (templateHeadTags.length > 0)
-    headTagSources.push(templateHeadTags);
+  if (templateHeadTags.length > 0) headTagSources.push(templateHeadTags);
   const headTags = headTagSources.length > 0 ? mergeHeadTags(headTagSources) : [];
   const hasCustomTitle = headTags.some((t) => t.tag?.toLowerCase() === "title");
   const titleTag = hasCustomTitle ? "" : "    <title>Vite + TS</title>\n";
-  const headTagsHtml = headTags.length > 0 ? serializeHeadTags(headTags) + "\n" : "";
+  const preconnectTags = headTags.filter(
+    (t) => t.tag === "link" && t.attrs?.rel === "preconnect"
+  );
+  const otherHeadTags = headTags.filter(
+    (t) => !(t.tag === "link" && t.attrs?.rel === "preconnect")
+  );
+  const preconnectHtml = preconnectTags.length > 0 ? serializeHeadTags(preconnectTags) + "\n" : "";
+  const headTagsHtml = otherHeadTags.length > 0 ? serializeHeadTags(otherHeadTags) + "\n" : "";
   const serverElementPath = route.serverElementPath || instance.serverElementPath;
   const tLoadStart = Date.now();
   const serverElement = await artifacts.loadServerElement(serverElementPath);
@@ -463,7 +473,7 @@ async function fetchPageRequest(match, manifest, requestUrl, artifacts, staticBa
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-${titleTag}${[cssPreload, cssImportPreloads].filter(Boolean).map((l) => l + "\n").join(
+${titleTag}${[preconnectHtml, cssPreload, cssImportPreloads].filter(Boolean).map((l) => l + "\n").join(
         ""
       )}    <script type="importmap">${JSON.stringify({ imports: importMap })}<\/script>
 ${headParts}
@@ -485,8 +495,7 @@ ${headParts}
       const tSsr = Date.now();
       write("</div>");
       const asyncScripts = (await Promise.all(asyncPromises)).filter((s) => s).join("");
-      if (asyncScripts)
-        write(asyncScripts);
+      if (asyncScripts) write(asyncScripts);
       const clientInitData = getClientInitData();
       const initArgs = route.routeClientBundlePath ? `${JSON.stringify(fullSlowViewState)}, ${JSON.stringify(fastViewState)}, ${JSON.stringify(fastCarryForward)}, ${JSON.stringify(clientInitData)}` : `${JSON.stringify(fastViewState)}, ${JSON.stringify(fastCarryForward)}, ${JSON.stringify(clientInitData)}`;
       const tTotal = Date.now() - t0;
@@ -494,7 +503,6 @@ ${headParts}
       const serverTiming = {
         cache: tCache,
         parts: tParts,
-        data: tData - t0,
         fast: tFast - tData,
         load: tLoadMs,
         ssr: tSsr - tSsrStart,
@@ -673,8 +681,7 @@ async function registerActionsFromModules(modules, registry = actionRegistry) {
   logger.info(`[Server] Registered ${count} actions from pre-imported modules`);
 }
 function getStatusCode(code, isActionError) {
-  if (isActionError)
-    return 422;
+  if (isActionError) return 422;
   switch (code) {
     case "ACTION_NOT_FOUND":
       return 404;
@@ -709,8 +716,7 @@ async function fetchStaticFile(pathname, frontendDir) {
   const normalizedBase = path.resolve(frontendDir);
   for (const candidate of [path.join(frontendDir, pathname)]) {
     const normalizedFile = path.resolve(candidate);
-    if (!normalizedFile.startsWith(normalizedBase))
-      continue;
+    if (!normalizedFile.startsWith(normalizedBase)) continue;
     try {
       const content = await fs.readFile(candidate);
       const ext = path.extname(candidate);
@@ -736,8 +742,7 @@ async function initializeServicesFromModules(plugins, label) {
       if (plugin.init?._serverInit) {
         logger.info(`[${label}] Running plugin init: ${plugin.name}`);
         const data = await plugin.init._serverInit();
-        if (data)
-          setClientInitData(plugin.name, data);
+        if (data) setClientInitData(plugin.name, data);
       }
     } catch (err) {
       logger.warn(`[${label}] Plugin init failed: ${plugin.name}: ${err.message}`);
@@ -772,8 +777,7 @@ async function initializeServices(buildDir, projectRoot, label) {
         if (init?._serverInit) {
           logger.info(`[${label}] Running plugin init: ${pluginInit.name}`);
           const data = await init._serverInit();
-          if (data)
-            setClientInitData(pluginInit.name, data);
+          if (data) setClientInitData(pluginInit.name, data);
         }
       } catch (err) {
         logger.warn(`[${label}] Plugin init failed: ${pluginInit.name}: ${err.message}`);
@@ -788,22 +792,21 @@ async function initializeServices(buildDir, projectRoot, label) {
     if (init?._serverInit) {
       logger.info(`[${label}] Running server init...`);
       const data = await init._serverInit();
-      if (data)
-        setClientInitData("project", data);
+      if (data) setClientInitData("project", data);
     }
   } catch {
   }
 }
 export {
   FilesystemArtifactStore as F,
-  fetchActionRequest as a,
-  registerActionsFromModules as b,
-  fetchStaticFile as c,
-  initializeServices as d,
-  initializeServicesFromModules as e,
-  fetchPageRequest as f,
+  fetchPageRequest as a,
+  fetchStaticFile as b,
+  initializeServicesFromModules as c,
+  isActionRequest as d,
+  registerActionsFromModules as e,
+  fetchActionRequest as f,
   buildPagePartsConfig as g,
-  isActionRequest as i,
+  initializeServices as i,
   loadProductionPageParts as l,
   matchRequest as m,
   registerActionsFromManifest as r

package/dist/{serve-index-lg6huJYm.d.ts → serve-index-Ccw8CNDg.d.ts}

@@ -36,6 +36,8 @@ interface RouteEntry {
     instances: InstanceEntry[];
     isPlugin?: boolean;
     pluginName?: string;
+    /** When true, dev-server tooling route (future: excluded from production builds). */
+    devOnly?: boolean;
 }
 interface InstanceEntry {
     params: Record<string, string>;
@@ -85,6 +87,7 @@ interface PagePartsConfigEntry {
     modulePath: string;
     exportName: string;
     source: 'npm' | 'local';
+    structural?: boolean;
 }
 interface PagePartsConfig {
     parts: Array<PagePartsConfigEntry & {
@@ -180,4 +183,4 @@ interface PreImportedPlugin {
 declare function initializeServicesFromModules(plugins: PreImportedPlugin[], label: string): Promise<void>;
 declare function initializeServices(buildDir: string, projectRoot: string, label: string): Promise<void>;
 
-export { type ActionEntry as A, type BuildOptions as B, type CacheEntry as C, FilesystemArtifactStore as F, type InstanceEntry as I, type MatchResult as M, type PluginEntry as P, type RouteManifest as R, type ServerElementModule as S, type RouteEntry as a, type RouteSegment as b, type BuildMetadata as c, type PageModule as d, type ArtifactStore as e, fetchPageRequest as f, fetchActionRequest as g, registerActionsFromModules as h, isActionRequest as i, fetchStaticFile as j, initializeServices as k, initializeServicesFromModules as l, matchRequest as m, type PreImportedPlugin as n, registerActionsFromManifest as r };
+export { type ActionEntry as A, type BuildOptions as B, type CacheEntry as C, FilesystemArtifactStore as F, type InstanceEntry as I, type MatchResult as M, type PageModule as P, type RouteManifest as R, type ServerElementModule as S, type RouteEntry as a, type ArtifactStore as b, type BuildMetadata as c, type PluginEntry as d, type PreImportedPlugin as e, type RouteSegment as f, fetchActionRequest as g, fetchPageRequest as h, fetchStaticFile as i, initializeServices as j, initializeServicesFromModules as k, isActionRequest as l, matchRequest as m, registerActionsFromModules as n, registerActionsFromManifest as r };

package/dist/serve-index.d.ts

@@ -1,4 +1,4 @@
-export { e as ArtifactStore, C as CacheEntry, F as FilesystemArtifactStore, I as InstanceEntry, M as MatchResult, n as PreImportedPlugin, a as RouteEntry, R as RouteManifest, S as ServerElementModule, g as fetchActionRequest, f as fetchPageRequest, j as fetchStaticFile, k as initializeServices, l as initializeServicesFromModules, i as isActionRequest, m as matchRequest, r as registerActionsFromManifest, h as registerActionsFromModules } from './serve-index-lg6huJYm.js';
+export { b as ArtifactStore, C as CacheEntry, F as FilesystemArtifactStore, I as InstanceEntry, M as MatchResult, e as PreImportedPlugin, a as RouteEntry, R as RouteManifest, S as ServerElementModule, g as fetchActionRequest, h as fetchPageRequest, i as fetchStaticFile, j as initializeServices, k as initializeServicesFromModules, l as isActionRequest, m as matchRequest, r as registerActionsFromManifest, n as registerActionsFromModules } from './serve-index-Ccw8CNDg.js';
 import '@jay-framework/ssr-runtime';
 import '@jay-framework/compiler-shared';
 import '@jay-framework/stack-server-runtime';

package/dist/serve-index.js

@@ -1,23 +1,13 @@
-import { F, a, f, c, d, e, i, m, r, b } from "./init-services-zmGSxSck.js";
-import "node:fs/promises";
-import "node:path";
-import "@jay-framework/stack-server-runtime";
-import "@jay-framework/view-state-merge";
-import "@jay-framework/ssr-runtime";
-import "node:module";
-import "@jay-framework/logger";
-import "@jay-framework/compiler-jay-html";
-import "@jay-framework/compiler-shared";
-import "@jay-framework/fullstack-component";
+import { F, f, a, b, i, c, d, m, r, e } from "./init-services-BVEuyIVG.js";
 export {
   F as FilesystemArtifactStore,
-  a as fetchActionRequest,
-  f as fetchPageRequest,
-  c as fetchStaticFile,
-  d as initializeServices,
-  e as initializeServicesFromModules,
-  i as isActionRequest,
+  f as fetchActionRequest,
+  a as fetchPageRequest,
+  b as fetchStaticFile,
+  i as initializeServices,
+  c as initializeServicesFromModules,
+  d as isActionRequest,
   m as matchRequest,
   r as registerActionsFromManifest,
-  b as registerActionsFromModules
+  e as registerActionsFromModules
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/production-server",
-  "version": "0.22.2",
+  "version": "0.23.1",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/index.js",
@@ -30,20 +30,20 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-html": "^0.22.2",
-    "@jay-framework/compiler-jay-stack": "^0.22.2",
-    "@jay-framework/compiler-shared": "^0.22.2",
-    "@jay-framework/fullstack-component": "^0.22.2",
-    "@jay-framework/logger": "^0.22.2",
-    "@jay-framework/ssr-runtime": "^0.22.2",
-    "@jay-framework/stack-route-scanner": "^0.22.2",
-    "@jay-framework/stack-server-runtime": "^0.22.2",
-    "@jay-framework/view-state-merge": "^0.22.2",
-    "@jay-framework/vite-plugin": "^0.22.2",
+    "@jay-framework/compiler-jay-html": "^0.23.1",
+    "@jay-framework/compiler-jay-stack": "^0.23.1",
+    "@jay-framework/compiler-shared": "^0.23.1",
+    "@jay-framework/fullstack-component": "^0.23.1",
+    "@jay-framework/logger": "^0.23.1",
+    "@jay-framework/ssr-runtime": "^0.23.1",
+    "@jay-framework/stack-route-scanner": "^0.23.1",
+    "@jay-framework/stack-server-runtime": "^0.23.1",
+    "@jay-framework/view-state-merge": "^0.23.1",
+    "@jay-framework/vite-plugin": "^0.23.1",
     "vite": "^5.0.11"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.22.2",
+    "@jay-framework/dev-environment": "^0.23.1",
     "@types/node": "^22.15.21",
     "rimraf": "^5.0.5",
     "tsup": "^8.0.1",