@jay-framework/dev-server 0.19.8 → 0.21.0

package/dist/index.js

@@ -16,7 +16,7 @@ import { createRequire as createRequire$1 } from "node:module";
 import * as fsSync from "node:fs";
 import fsSync__default from "node:fs";
 import { scanRoutes, createRoute, routeToExpressRoute } from "@jay-framework/stack-route-scanner";
-import { discoverPluginsWithInit, sortPluginsByDependencies, executePluginServerInits, runInitCallbacks, actionRegistry, discoverAndRegisterActions, discoverAllPluginActions, runShutdownCallbacks, clearLifecycleCallbacks, clearServiceRegistry, clearClientInitData, loadPageParts, runLoadParams, DevSlowlyChangingPhase, SlowRenderCache, preparePluginClientInits, registerService, clearServerElementCache, scanPlugins, getServiceRegistry, materializeContracts, parseCookies, renderFastChangingData, mergeHeadTags, generateClientScript, getClientInitData, generateSSRPageHtml, generateFrozenPageHtml, slowRenderInstances } from "@jay-framework/stack-server-runtime";
+import { discoverPluginsWithInit, sortPluginsByDependencies, executePluginServerInits, runInitCallbacks, actionRegistry, discoverAndRegisterActions, discoverAllPluginActions, runShutdownCallbacks, clearLifecycleCallbacks, clearServiceRegistry, clearClientInitData, loadPageParts, runLoadParams, DevSlowlyChangingPhase, SlowRenderCache, preparePluginClientInits, registerService, clearServerElementCache, scanPlugins, getServiceRegistry, materializeContracts, parseCookies, renderFastChangingData, mergeHeadTags, generateClientScript, getClientInitData, generateSSRPageHtml, generateFrozenPageHtml, slowRenderInstances, normalizeAndResolveInstanceProps } from "@jay-framework/stack-server-runtime";
 import * as fs from "node:fs/promises";
 import fs__default from "node:fs/promises";
 import { pathToFileURL } from "node:url";
@@ -2669,7 +2669,9 @@ async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRen
     renderedSlowly.rendered,
     initialPartsResult.val.headlessContracts,
     initialPartsResult.val.headlessInstanceComponents,
-    partKeys
+    partKeys,
+    pageParams,
+    pageProps
   );
   timing?.recordSlowRender(Date.now() - slowStart);
   if (!preRenderResult) {
@@ -2923,7 +2925,7 @@ async function handleFrozenRequest(vite, route, options, freezeStore, slowRender
       options.projectRootFolder,
       routeDir,
       options.jayRollupConfig?.tsConfigFilePath,
-      void 0,
+      sourceDir,
       format,
       entry.name
     );
@@ -2938,7 +2940,7 @@ async function handleFrozenRequest(vite, route, options, freezeStore, slowRender
   }
   timing?.end();
 }
-async function preRenderJayHtml(route, slowViewState, headlessContracts, headlessInstanceComponents, partKeys = []) {
+async function preRenderJayHtml(route, slowViewState, headlessContracts, headlessInstanceComponents, partKeys = [], pageParams = {}, pageProps = { language: "en", url: "" }) {
   const jayHtmlContent = await fs__default.readFile(route.jayHtmlPath, "utf-8");
   const sourceDir = path__default.dirname(route.jayHtmlPath);
   const jayHtmlWithTemplates = injectHeadfullFSTemplates(
@@ -2989,7 +2991,8 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
     if (finalDiscovery.instances.length > 0) {
       const slowResult = await slowRenderInstances(
         finalDiscovery.instances,
-        headlessInstanceComponents
+        headlessInstanceComponents,
+        { pageViewState: slowViewState, pageParams, pageProps }
       );
       if (slowResult) {
         instancePhaseData = slowResult.instancePhaseData;
@@ -3002,14 +3005,13 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
         instancePhaseData = {
           discovered: finalDiscovery.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);
-            }
+            const normalizedProps = normalizeAndResolveInstanceProps(
+              Object.fromEntries(
+                Object.entries(i.props).map(([k, v]) => [k, String(v)])
+              ),
+              comp.contract?.props,
+              { pageViewState: slowViewState, pageParams, pageProps }
+            );
             return {
               contractName: i.contractName,
               props: normalizedProps,
@@ -3113,6 +3115,15 @@ async function mkDevServer(rawOptions) {
       filteredProjectRoutes2
     );
     const scannedJayRoutes = [...filteredProjectRoutes2, ...pluginRoutes2];
+    const scannedRawRoutes = new Set(scannedJayRoutes.map((r) => r.rawRoute));
+    for (let i = devServerRoutes.length - 1; i >= 0; i--) {
+      const route = devServerRoutes[i];
+      const fsPath = route.fsRoute.jayHtmlPath;
+      const stillOnDisk = scannedRawRoutes.has(route.fsRoute.rawRoute) && fsSync__default.existsSync(fsPath);
+      if (!stillOnDisk) {
+        devServerRoutes.splice(i, 1);
+      }
+    }
     const existingRawRoutes = new Set(devServerRoutes.map((r) => r.fsRoute.rawRoute));
     const added = [];
     for (const jayRoute of scannedJayRoutes) {

package/package.json

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