@jay-framework/production-server 0.24.1 → 0.24.3

package/dist/{init-services-Dy2SiHzw.js → init-services-CnM6IinC.js}

@@ -6,236 +6,8 @@ import path from "node:path";
 import { renderFastChangingData, headMetaToHeadTags, mergeHeadTags, serializeHeadTags, getClientInitData, actionRegistry, setClientInitData } from "@jay-framework/stack-server-runtime";
 import { deepMergeViewStates } from "@jay-framework/view-state-merge";
 import { asyncSwapScript } from "@jay-framework/ssr-runtime";
-import { createRequire } from "node:module";
-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 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;
-  const parts = compDefinition ? [{ compDefinition, clientImport: "", clientPart: "" }] : [];
-  const dirName = path.dirname(route.jayHtmlPath);
-  const fileName = path.basename(route.jayHtmlPath);
-  const jayHtmlWithValidations = await parseJayFile(
-    jayHtmlContent,
-    fileName,
-    dirName,
-    { relativePath: tsConfigFilePath },
-    JAY_IMPORT_RESOLVER,
-    projectRoot
-  );
-  const jayHtml = checkValidationErrors(jayHtmlWithValidations);
-  const headlessInstanceComponents = [];
-  const keyedPartModules = [];
-  const headlessModuleInfos = [];
-  const headlessImports = jayHtml.headlessImports ?? [];
-  getLogger().info(
-    `[Build] headlessImports for ${fileName}: ${headlessImports.length}, keys: ${Object.keys(jayHtml).join(",")}`
-  );
-  for (const headlessImport of headlessImports) {
-    const module = headlessImport.codeLink.module;
-    const name = headlessImport.codeLink.names[0].name;
-    const isLocalModule = module[0] === "." || module[0] === "/";
-    let modulePath;
-    if (isLocalModule) {
-      const sourcePath = path.resolve(dirName, module);
-      if (serverBuildDir) {
-        const relativeToSrc = path.relative(path.join(projectRoot, "src"), sourcePath);
-        let compiledPath = path.join(serverBuildDir, relativeToSrc);
-        compiledPath = compiledPath.replace(/\.ts$/, ".js");
-        if (!compiledPath.endsWith(".js")) {
-          const indexPath = path.join(compiledPath, "index.js");
-          try {
-            await fs.access(indexPath);
-            compiledPath = indexPath;
-          } catch {
-            compiledPath += ".js";
-          }
-        }
-        modulePath = compiledPath;
-      } else {
-        modulePath = sourcePath;
-      }
-    } else {
-      modulePath = module;
-    }
-    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;
-      parts.push({
-        key: headlessImport.key,
-        compDefinition: headlessCompDef,
-        clientImport: "",
-        clientPart: "",
-        contractInfo: ci,
-        headlessProps: headlessImport.headlessProps
-      });
-      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,
-        structural: headlessImport.structural
-      });
-    }
-    if (!headlessImport.key && headlessImport.contract) {
-      headlessInstanceComponents.push({
-        contractName: headlessImport.contractName,
-        compDefinition: headlessCompDef,
-        contract: headlessImport.contract
-      });
-      headlessModuleInfos.push({
-        modulePath,
-        exportName: name,
-        isLocal: isLocalModule,
-        contractName: headlessImport.contractName,
-        propNames: headlessImport.contract.props?.map((p) => p.name) ?? [],
-        structural: headlessImport.structural
-      });
-    }
-  }
-  const headlessContracts = (jayHtml.headlessImports ?? []).filter((hi) => hi.contract && hi.key).map((hi) => ({
-    key: hi.key,
-    contract: hi.contract,
-    contractPath: hi.contractPath
-  }));
-  const jayHtmlForDiscovery = injectHeadfullFSTemplates(
-    jayHtmlContent,
-    dirName,
-    JAY_IMPORT_RESOLVER
-  );
-  let discoveredInstances = [];
-  let forEachInstances = [];
-  if (headlessInstanceComponents.length > 0) {
-    const contractNames = new Set(headlessInstanceComponents.map((c) => c.contractName));
-    const withCoords = assignCoordinatesToJayHtml(jayHtmlForDiscovery, contractNames);
-    const discovery = discoverHeadlessInstances(withCoords);
-    discoveredInstances = discovery.instances;
-    forEachInstances = discovery.forEachInstances;
-  }
-  return {
-    parts,
-    headlessContracts,
-    headlessInstanceComponents,
-    discoveredInstances,
-    forEachInstances,
-    keyedPartModules,
-    headlessModuleInfos,
-    serverTrackByMap: jayHtml.serverTrackByMap,
-    clientTrackByMap: jayHtml.clientTrackByMap
-  };
-}
-function buildPagePartsConfig(pageParts, pageServerModule, pageExportName, buildDir, pageIsPlugin = false) {
-  const parts = [];
-  if (pageServerModule) {
-    parts.push({
-      modulePath: pageServerModule,
-      exportName: pageExportName,
-      source: pageIsPlugin ? "npm" : "local"
-    });
-  }
-  for (const info of pageParts.headlessModuleInfos) {
-    if (info.key) {
-      parts.push({
-        modulePath: info.isLocal ? path.relative(buildDir, info.modulePath) : info.modulePath,
-        exportName: info.exportName,
-        source: info.isLocal ? "local" : "npm",
-        key: info.key,
-        contractInfo: info.contractInfo,
-        headlessProps: info.headlessProps
-      });
-    }
-  }
-  const instanceComponents = [];
-  for (const info of pageParts.headlessModuleInfos) {
-    if (info.contractName) {
-      instanceComponents.push({
-        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 ?? [],
-        ...info.structural ? { structural: true } : {}
-      });
-    }
-  }
-  return {
-    parts,
-    instanceComponents,
-    forEachInstances: pageParts.forEachInstances.map((fi) => ({
-      contractName: fi.contractName,
-      forEachPath: fi.forEachPath,
-      trackBy: fi.trackBy,
-      propBindings: fi.propBindings,
-      coordinateSuffix: fi.coordinateSuffix
-    }))
-  };
-}
-async function loadPagePartsFromConfig(configPath, artifacts) {
-  const config = await artifacts.readPagePartsConfig(configPath);
-  async function importModule(entry) {
-    if (!entry.modulePath) {
-      throw new Error(
-        `Empty modulePath in page-parts.json for "${entry.exportName}" (source: ${entry.source}). Rebuild required.`
-      );
-    }
-    return artifacts.loadModule(entry.modulePath, entry.source === "local");
-  }
-  const parts = [];
-  for (const entry of config.parts) {
-    const mod = await importModule(entry);
-    parts.push({
-      compDefinition: mod[entry.exportName] ?? mod.default,
-      key: entry.key,
-      clientImport: "",
-      clientPart: "",
-      contractInfo: entry.contractInfo,
-      headlessProps: entry.headlessProps
-    });
-  }
-  const headlessInstanceComponents = [];
-  for (const entry of config.instanceComponents) {
-    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,
-      contract: serveTimeContract
-    });
-  }
-  return {
-    parts,
-    headlessContracts: [],
-    headlessInstanceComponents,
-    discoveredInstances: [],
-    forEachInstances: config.forEachInstances,
-    keyedPartModules: [],
-    headlessModuleInfos: []
-  };
-}
+import { getLogger } from "@jay-framework/logger";
 class FilesystemArtifactStore {
   constructor(basePath) {
     __publicField(this, "manifestCache");
@@ -365,6 +137,51 @@ function buildImportMap(sharedManifest, publicBasePath, sharedDir = "shared") {
   }
   return imports;
 }
+async function loadPagePartsFromConfig(configPath, artifacts) {
+  const config = await artifacts.readPagePartsConfig(configPath);
+  async function importModule(entry) {
+    if (!entry.modulePath) {
+      throw new Error(
+        `Empty modulePath in page-parts.json for "${entry.exportName}" (source: ${entry.source}). Rebuild required.`
+      );
+    }
+    return artifacts.loadModule(entry.modulePath, entry.source === "local");
+  }
+  const parts = [];
+  for (const entry of config.parts) {
+    const mod = await importModule(entry);
+    parts.push({
+      compDefinition: mod[entry.exportName] ?? mod.default,
+      key: entry.key,
+      clientImport: "",
+      clientPart: "",
+      contractInfo: entry.contractInfo,
+      headlessProps: entry.headlessProps
+    });
+  }
+  const headlessInstanceComponents = [];
+  for (const entry of config.instanceComponents) {
+    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,
+      contract: serveTimeContract
+    });
+  }
+  return {
+    parts,
+    headlessContracts: [],
+    headlessInstanceComponents,
+    discoveredInstances: [],
+    forEachInstances: config.forEachInstances,
+    keyedPartModules: [],
+    headlessModuleInfos: []
+  };
+}
 const pagePartsCache = /* @__PURE__ */ new Map();
 async function getPageParts(route, artifacts, cachePath) {
   const cacheKey = route.pattern;
@@ -457,7 +274,8 @@ async function fetchPageRequest(match, manifest, requestUrl, artifacts, staticBa
     importMap["jay-route-hydrate"] = `${staticBaseUrl}${route.routeHydratePath}`;
   }
   const clientBundleUrl = route.routeClientBundlePath ? `${staticBaseUrl}${route.routeClientBundlePath}` : `${staticBaseUrl}${instance.clientBundlePath}`;
-  const preloadUrls = [...Object.values(importMap), clientBundleUrl];
+  const sharedPreloads = route.sharedDeps ? route.sharedDeps.map((dep) => importMap[dep]).filter(Boolean) : Object.values(importMap);
+  const preloadUrls = [...sharedPreloads, clientBundleUrl];
   const modulePreloads = preloadUrls.map((url) => `    <link rel="modulepreload" href="${url}" />`).join("\n");
   const cssUrl = instance.clientCssPath ? `${staticBaseUrl}${instance.clientCssPath}` : "";
   const cssPreload = cssUrl ? `    <link rel="preload" href="${cssUrl}" as="style" />` : "";
@@ -807,9 +625,8 @@ export {
   isActionRequest as d,
   registerActionsFromModules as e,
   fetchActionRequest as f,
-  buildPagePartsConfig as g,
   initializeServices as i,
-  loadProductionPageParts as l,
+  loadPagePartsFromConfig as l,
   matchRequest as m,
   registerActionsFromManifest as r
 };

package/dist/{serve-index-cRXZm8vQ.d.ts → serve-index-B45QVQoo.d.ts}

@@ -1,6 +1,5 @@
 import * as _jay_framework_ssr_runtime from '@jay-framework/ssr-runtime';
-import { JayHtmlHeadMeta } from '@jay-framework/compiler-shared';
-import { ActionRegistry } from '@jay-framework/stack-server-runtime';
+import { JayHtmlHeadMeta, DevServerPagePart, HeadlessInstanceComponent, ForEachHeadlessInstance, ActionRegistry } from '@jay-framework/stack-server-runtime';
 
 interface RouteManifest {
     version: string;
@@ -38,6 +37,8 @@ interface RouteEntry {
     instances: InstanceEntry[];
     isPlugin?: boolean;
     pluginName?: string;
+    /** Shared chunk package names this route's hydrate script imports (DL#177). */
+    sharedDeps?: string[];
     /** When true, dev-server tooling route (future: excluded from production builds). */
     devOnly?: boolean;
 }
@@ -90,7 +91,7 @@ interface PageModule {
 interface PagePartsConfigEntry {
     modulePath: string;
     exportName: string;
-    source: 'npm' | 'local';
+    source: 'local' | 'npm';
     structural?: boolean;
 }
 interface PagePartsConfig {
@@ -114,6 +115,16 @@ interface PagePartsConfig {
         coordinateSuffix: string;
     }>;
 }
+interface ProductionPageParts {
+    parts: DevServerPagePart[];
+    headlessContracts: any[];
+    headlessInstanceComponents: HeadlessInstanceComponent[];
+    discoveredInstances: any[];
+    forEachInstances: ForEachHeadlessInstance[];
+    keyedPartModules: any[];
+    headlessModuleInfos: any[];
+}
+declare function loadPagePartsFromConfig(configPath: string, artifacts: ArtifactStore): Promise<ProductionPageParts>;
 
 /**
  * Interface for reading build artifacts at serve time (DL#143).
@@ -187,4 +198,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 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 };
+export { type ActionEntry as A, type BuildMetadata 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 BuildOptions 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, loadPagePartsFromConfig as m, matchRequest as n, registerActionsFromModules as o, registerActionsFromManifest as r };

package/dist/serve-index.d.ts

@@ -1,4 +1,3 @@
-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-cRXZm8vQ.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, n as matchRequest, r as registerActionsFromManifest, o as registerActionsFromModules } from './serve-index-B45QVQoo.js';
 import '@jay-framework/ssr-runtime';
-import '@jay-framework/compiler-shared';
 import '@jay-framework/stack-server-runtime';

package/dist/serve-index.js

@@ -1,4 +1,4 @@
-import { F, f, a, b, i, c, d, m, r, e } from "./init-services-Dy2SiHzw.js";
+import { F, f, a, b, i, c, d, m, r, e } from "./init-services-CnM6IinC.js";
 export {
   F as FilesystemArtifactStore,
   f as fetchActionRequest,

package/package.json

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