@jay-framework/dev-server 0.12.0 → 0.13.0

package/dist/index.js

@@ -15,7 +15,7 @@ import { getLogger, getDevLogger } from "@jay-framework/logger";
 import { createRequire as createRequire$1 } from "node:module";
 import * as fs from "node:fs";
 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, 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, getServiceRegistry, materializeContracts, loadPageParts, renderFastChangingData, validateForEachInstances, slowRenderInstances, generateClientScript, getClientInitData, resolveServices } 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, {
@@ -1401,9 +1401,7 @@ async function createViteForCli(options) {
         ignored: ["**/build/**"]
       }
     },
-    plugins: [
-      ...jayStackCompiler({ tsConfigFilePath })
-    ],
+    plugins: [...jayStackCompiler({ tsConfigFilePath })],
     appType: "custom",
     root: projectRoot,
     ssr: {
@@ -1864,7 +1862,12 @@ function filterPluginsForPage(allPluginClientInits, allPluginsWithInit, usedPack
     pluginsByPackage.set(plugin.packageName, plugin);
   }
   const expandedPackages = new Set(usedPackages);
-  const toProcess = [...usedPackages];
+  for (const plugin of allPluginsWithInit) {
+    if (plugin.global) {
+      expandedPackages.add(plugin.packageName);
+    }
+  }
+  const toProcess = [...expandedPackages];
   while (toProcess.length > 0) {
     const packageName = toProcess.pop();
     const plugin = pluginsByPackage.get(packageName);
@@ -2001,10 +2004,11 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
   let fastViewState = renderedFast.rendered;
   let fastCarryForward = renderedFast.carryForward;
   const instancePhaseData = cachedEntry.carryForward?.__instances;
-  if (instancePhaseData && pagePartsResult.val.headlessInstanceComponents.length > 0) {
+  const headlessComps = pagePartsResult.val.headlessInstanceComponents;
+  if (instancePhaseData && headlessComps.length > 0) {
     const instanceFastResult = await renderFastChangingDataForInstances(
       instancePhaseData,
-      pagePartsResult.val.headlessInstanceComponents
+      headlessComps
     );
     if (instanceFastResult) {
       fastViewState = {
@@ -2016,6 +2020,20 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
         __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,
@@ -2075,7 +2093,20 @@ async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRen
     timing?.end();
     return;
   }
-  const carryForward = preRenderResult.instancePhaseData ? { ...renderedSlowly.carryForward, __instances: preRenderResult.instancePhaseData } : renderedSlowly.carryForward;
+  let instancePhaseDataForCache = preRenderResult.instancePhaseData;
+  if (instancePhaseDataForCache && preRenderResult.forEachInstances) {
+    instancePhaseDataForCache = {
+      ...instancePhaseDataForCache,
+      forEachInstances: preRenderResult.forEachInstances
+    };
+  } else if (preRenderResult.forEachInstances) {
+    instancePhaseDataForCache = {
+      discovered: [],
+      carryForwards: {},
+      forEachInstances: preRenderResult.forEachInstances
+    };
+  }
+  const carryForward = instancePhaseDataForCache ? { ...renderedSlowly.carryForward, __instances: instancePhaseDataForCache } : renderedSlowly.carryForward;
   const preRenderedPath = await slowRenderCache.set(
     route.jayHtmlPath,
     pageParams,
@@ -2120,10 +2151,11 @@ async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRen
   let fastViewState = renderedFast.rendered;
   let fastCarryForward = renderedFast.carryForward;
   const instancePhaseData = carryForward?.__instances;
-  if (instancePhaseData && pagePartsResult.val.headlessInstanceComponents.length > 0) {
+  const headlessComps = pagePartsResult.val.headlessInstanceComponents;
+  if (instancePhaseData && headlessComps.length > 0) {
     const instanceFastResult = await renderFastChangingDataForInstances(
       instancePhaseData,
-      pagePartsResult.val.headlessInstanceComponents
+      headlessComps
     );
     if (instanceFastResult) {
       fastViewState = {
@@ -2135,6 +2167,20 @@ async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRen
         __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,
@@ -2191,10 +2237,26 @@ async function handleDirectRequest(vite, route, options, slowlyPhase, pageParams
   }
   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,
@@ -2228,6 +2290,20 @@ async function handleDirectRequest(vite, route, options, slowlyPhase, pageParams
       }
     }
   }
+  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);
@@ -2332,9 +2408,23 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
   }
   let preRenderedJayHtml = result.val.preRenderedJayHtml;
   let instancePhaseData;
+  let forEachInstances;
   if (headlessInstanceComponents.length > 0) {
     const discoveryResult = discoverHeadlessInstances(preRenderedJayHtml);
     preRenderedJayHtml = discoveryResult.preRenderedJayHtml;
+    if (discoveryResult.forEachInstances.length > 0) {
+      const validationErrors = validateForEachInstances(
+        discoveryResult.forEachInstances,
+        headlessInstanceComponents
+      );
+      if (validationErrors.length > 0) {
+        getLogger().error(
+          `[SlowRender] ForEach instance validation failed: ${validationErrors.join(", ")}`
+        );
+        return void 0;
+      }
+      forEachInstances = discoveryResult.forEachInstances;
+    }
     if (discoveryResult.instances.length > 0) {
       const slowResult = await slowRenderInstances(
         discoveryResult.instances,
@@ -2358,7 +2448,7 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
       }
     }
   }
-  return { preRenderedJayHtml, instancePhaseData };
+  return { preRenderedJayHtml, instancePhaseData, forEachInstances };
 }
 async function renderFastChangingDataForInstances(instancePhaseData, headlessInstanceComponents) {
   const componentByContractName = /* @__PURE__ */ new Map();
@@ -2389,6 +2479,49 @@ async function renderFastChangingDataForInstances(instancePhaseData, headlessIns
   }
   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;
+        }
+      }
+    }
+  }
+  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;
+}
 async function materializeDynamicContracts(projectRootFolder, buildFolder, viteServer) {
   try {
     const services = getServiceRegistry();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/dev-server",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "type": "module",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -22,22 +22,22 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-stack": "^0.12.0",
-    "@jay-framework/compiler-shared": "^0.12.0",
-    "@jay-framework/component": "^0.12.0",
-    "@jay-framework/fullstack-component": "^0.12.0",
-    "@jay-framework/logger": "^0.12.0",
-    "@jay-framework/runtime": "^0.12.0",
-    "@jay-framework/stack-client-runtime": "^0.12.0",
-    "@jay-framework/stack-route-scanner": "^0.12.0",
-    "@jay-framework/stack-server-runtime": "^0.12.0",
-    "@jay-framework/view-state-merge": "^0.12.0",
+    "@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",
     "vite": "^5.0.11"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.12.0",
-    "@jay-framework/jay-cli": "^0.12.0",
-    "@jay-framework/stack-client-runtime": "^0.12.0",
+    "@jay-framework/dev-environment": "^0.13.0",
+    "@jay-framework/jay-cli": "^0.13.0",
+    "@jay-framework/stack-client-runtime": "^0.13.0",
     "@types/express": "^5.0.2",
     "@types/node": "^22.15.21",
     "nodemon": "^3.0.3",