@jay-framework/stack-server-runtime 0.15.3 → 0.15.5

package/dist/index.d.ts

@@ -539,6 +539,15 @@ interface PluginClientInitInfo {
  */
 declare function preparePluginClientInits(plugins: PluginWithInit[]): PluginClientInitInfo[];
 
+/**
+ * Generate JS code to reconstruct Promise.resolve()/Promise.reject() for async ViewState properties.
+ * JSON.stringify drops Promise objects, so this emits assignments that recreate them from tracked outcomes.
+ */
+declare function generatePromiseReconstruction(outcomes: Array<{
+    id: string;
+    status: 'resolved' | 'rejected';
+    value: any;
+}>): string;
 /**
  * Information needed to generate client init script for the project.
  */
@@ -583,7 +592,21 @@ declare function buildScriptFragments(parts: DevServerPagePart[], clientInitData
  * @param mode - 'client' appends to DOM; 'hydrate' skips appendChild (DOM already present)
  */
 declare function buildAutomationWrap(options: GenerateClientScriptOptions, mode: 'client' | 'hydrate'): string;
-declare function generateClientScript(defaultViewState: object, fastCarryForward: object, parts: DevServerPagePart[], jayHtmlPath: string, trackByMap?: TrackByMap, clientInitData?: Record<string, Record<string, any>>, projectInit?: ProjectClientInitInfo, pluginInits?: PluginClientInitInfo[], options?: GenerateClientScriptOptions): string;
+/**
+ * Resolve all top-level Promise values in a ViewState object.
+ * Returns the ViewState with Promises replaced by their resolved values,
+ * plus a list of outcomes for reconstructing Promise.resolve()/Promise.reject()
+ * in the client script.
+ */
+declare function resolveViewStatePromises(viewState: object): Promise<{
+    resolved: object;
+    outcomes: Array<{
+        id: string;
+        status: 'resolved' | 'rejected';
+        value: any;
+    }>;
+}>;
+declare function generateClientScript(defaultViewState: object, fastCarryForward: object, parts: DevServerPagePart[], jayHtmlPath: string, trackByMap?: TrackByMap, clientInitData?: Record<string, Record<string, any>>, projectInit?: ProjectClientInitInfo, pluginInits?: PluginClientInitInfo[], options?: GenerateClientScriptOptions): Promise<string>;
 
 /**
  * Invalidate the cached server element module for a jay-html file.
@@ -1127,4 +1150,4 @@ declare function executePluginReferences(plugin: PluginWithReferences, options:
     verbose?: boolean;
 }): Promise<PluginReferencesResult>;
 
-export { type ActionDiscoveryOptions, type ActionDiscoveryResult, type ActionErrorResponse, type ActionExecutionResult, type ActionIndexEntry, type ActionMetadata, ActionRegistry, type ActionSchema, type DevServerPagePart, DevSlowlyChangingPhase, type GenerateClientScriptOptions, type HeadlessInstanceComponent, type InstancePhaseData, type InstanceSlowRenderResult, type LoadedPageParts, type MaterializeContractsOptions, type MaterializeResult, type PluginActionDiscoveryOptions, type PluginClientInitInfo, type PluginContractEntry, type PluginInitDiscoveryOptions, type PluginReferencesContext, type PluginReferencesHandler, type PluginReferencesResult, type PluginScanOptions, type PluginSetupContext, type PluginSetupHandler, type PluginSetupResult, type PluginWithInit, type PluginWithReferences, type PluginWithSetup, type PluginsIndex, type PluginsIndexEntry, type ProjectClientInitInfo, type RegisteredAction, type ScannedPlugin, type ScriptFragments, SlowRenderCache, type SlowRenderCacheEntry, type SlowlyChangingPhase, type ViteSSRLoader, actionRegistry, buildAutomationWrap, buildScriptFragments, clearActionRegistry, clearClientInitData, clearLifecycleCallbacks, clearServerElementCache, clearServiceRegistry, discoverAllPluginActions, discoverAndRegisterActions, discoverPluginActions, discoverPluginsWithInit, discoverPluginsWithReferences, discoverPluginsWithSetup, executeAction, executePluginReferences, executePluginServerInits, executePluginSetup, generateClientScript, generateSSRPageHtml, getActionCacheHeaders, getClientInitData, getClientInitDataForKey, getRegisteredAction, getRegisteredActionNames, getService, getServiceRegistry, hasAction, hasService, invalidateServerElementCache, listContracts, loadActionMetadata, loadPageParts, materializeContracts, onInit, onShutdown, parseActionMetadata, preparePluginClientInits, registerAction, registerService, renderFastChangingData, resolveActionMetadataPath, resolveServices, runInitCallbacks, runLoadParams, runShutdownCallbacks, runSlowlyChangingRender, scanPlugins, setClientInitData, slowRenderInstances, sortPluginsByDependencies, validateForEachInstances };
+export { type ActionDiscoveryOptions, type ActionDiscoveryResult, type ActionErrorResponse, type ActionExecutionResult, type ActionIndexEntry, type ActionMetadata, ActionRegistry, type ActionSchema, type DevServerPagePart, DevSlowlyChangingPhase, type GenerateClientScriptOptions, type HeadlessInstanceComponent, type InstancePhaseData, type InstanceSlowRenderResult, type LoadedPageParts, type MaterializeContractsOptions, type MaterializeResult, type PluginActionDiscoveryOptions, type PluginClientInitInfo, type PluginContractEntry, type PluginInitDiscoveryOptions, type PluginReferencesContext, type PluginReferencesHandler, type PluginReferencesResult, type PluginScanOptions, type PluginSetupContext, type PluginSetupHandler, type PluginSetupResult, type PluginWithInit, type PluginWithReferences, type PluginWithSetup, type PluginsIndex, type PluginsIndexEntry, type ProjectClientInitInfo, type RegisteredAction, type ScannedPlugin, type ScriptFragments, SlowRenderCache, type SlowRenderCacheEntry, type SlowlyChangingPhase, type ViteSSRLoader, actionRegistry, buildAutomationWrap, buildScriptFragments, clearActionRegistry, clearClientInitData, clearLifecycleCallbacks, clearServerElementCache, clearServiceRegistry, discoverAllPluginActions, discoverAndRegisterActions, discoverPluginActions, discoverPluginsWithInit, discoverPluginsWithReferences, discoverPluginsWithSetup, executeAction, executePluginReferences, executePluginServerInits, executePluginSetup, generateClientScript, generatePromiseReconstruction, generateSSRPageHtml, getActionCacheHeaders, getClientInitData, getClientInitDataForKey, getRegisteredAction, getRegisteredActionNames, getService, getServiceRegistry, hasAction, hasService, invalidateServerElementCache, listContracts, loadActionMetadata, loadPageParts, materializeContracts, onInit, onShutdown, parseActionMetadata, preparePluginClientInits, registerAction, registerService, renderFastChangingData, resolveActionMetadataPath, resolveServices, resolveViewStatePromises, runInitCallbacks, runLoadParams, runShutdownCallbacks, runSlowlyChangingRender, scanPlugins, setClientInitData, slowRenderInstances, sortPluginsByDependencies, validateForEachInstances };

package/dist/index.js

@@ -15,10 +15,10 @@ import { parseJayFile, JAY_IMPORT_RESOLVER, generateServerElementFile, discoverH
 import fs$2 from "node:fs/promises";
 import * as path from "node:path";
 import path__default from "node:path";
+import crypto from "node:crypto";
 import { getLogger } from "@jay-framework/logger";
 import * as fs from "node:fs";
 import { createRequire as createRequire$1 } from "node:module";
-import crypto from "node:crypto";
 const serviceRegistry = /* @__PURE__ */ new Map();
 function registerService(marker, service) {
   serviceRegistry.set(marker, service);
@@ -203,7 +203,7 @@ new JayObjectType("Error", {
   stack: new JayAtomicType("string")
 });
 function isOptionalType(aType) {
-  return aType.kind === 13;
+  return aType.kind === 14;
 }
 function isAtomicType(aType) {
   return aType.kind === 0;
@@ -220,6 +220,9 @@ function isObjectType(aType) {
 function isArrayType(aType) {
   return aType.kind === 9;
 }
+function isRecordType(aType) {
+  return aType.kind === 11;
+}
 function jayTypeToJsonSchema(type) {
   if (isOptionalType(type)) {
     return jayTypeToJsonSchema(type.innerType);
@@ -244,6 +247,13 @@ function jayTypeToJsonSchema(type) {
     }
     return { type: "array" };
   }
+  if (isRecordType(type)) {
+    const valueSchema = jayTypeToJsonSchema(type.itemType);
+    if (valueSchema) {
+      return { type: "object", additionalProperties: valueSchema };
+    }
+    return { type: "object" };
+  }
   if (isObjectType(type)) {
     const properties = {};
     const required = [];
@@ -483,6 +493,18 @@ async function renderFastChangingData(pageParams, pageProps, carryForward, parts
   }
   return Promise.resolve(phaseOutput(fastViewState, fastCarryForward));
 }
+function generatePromiseReconstruction(outcomes) {
+  if (outcomes.length === 0)
+    return "";
+  return outcomes.map((outcome) => {
+    if (outcome.status === "resolved") {
+      return `      viewState[${JSON.stringify(outcome.id)}] = Promise.resolve(${JSON.stringify(outcome.value)});`;
+    } else {
+      const errMsg = outcome.value?.message ?? "Unknown error";
+      return `      viewState[${JSON.stringify(outcome.id)}] = Promise.reject(new Error(${JSON.stringify(errMsg)}));`;
+    }
+  }).join("\n") + "\n";
+}
 function buildScriptFragments(parts, clientInitData2, projectInit, pluginInits, options) {
   const { enableAutomation = true, slowViewState } = options;
   const hasSlowViewState = slowViewState && Object.keys(slowViewState).length > 0;
@@ -558,7 +580,34 @@ function buildAutomationWrap(options, mode) {
       window.__jay.automation = wrapped.automation;
       window.dispatchEvent(new Event('jay:automation-ready'));${appendLine}`;
 }
-function generateClientScript(defaultViewState, fastCarryForward, parts, jayHtmlPath, trackByMap = {}, clientInitData2 = {}, projectInit, pluginInits = [], options = {}) {
+async function resolveViewStatePromises(viewState) {
+  const entries = Object.entries(viewState);
+  const hasPromises = entries.some(([, v]) => v instanceof Promise);
+  if (!hasPromises)
+    return { resolved: viewState, outcomes: [] };
+  const result = { ...viewState };
+  const outcomes = [];
+  for (const [key, value] of entries) {
+    if (value instanceof Promise) {
+      try {
+        const val = await value;
+        result[key] = val;
+        outcomes.push({ id: key, status: "resolved", value: val });
+      } catch (err) {
+        delete result[key];
+        outcomes.push({
+          id: key,
+          status: "rejected",
+          value: { message: err?.message ?? String(err) }
+        });
+      }
+    }
+  }
+  return { resolved: result, outcomes };
+}
+async function generateClientScript(defaultViewState, fastCarryForward, parts, jayHtmlPath, trackByMap = {}, clientInitData2 = {}, projectInit, pluginInits = [], options = {}) {
+  const { resolved, outcomes } = await resolveViewStatePromises(defaultViewState);
+  defaultViewState = resolved;
   const {
     partImports,
     compositeParts,
@@ -586,7 +635,7 @@ function generateClientScript(defaultViewState, fastCarryForward, parts, jayHtml
       import { render } from '${jayHtmlPath}';
       ${partImports}${slowViewStateDecl}
       const viewState = ${JSON.stringify(defaultViewState)};
-      const fastCarryForward = ${JSON.stringify(fastCarryForward)};
+${generatePromiseReconstruction(outcomes)}      const fastCarryForward = ${JSON.stringify(fastCarryForward)};
       const trackByMap = ${JSON.stringify(trackByMap)};
 ${clientInitExecution}
       const target = document.getElementById('target');
@@ -598,6 +647,10 @@ ${automationWrap}
   </body>
 </html>`;
 }
+function asyncSwapScript(id, html) {
+  const escapedHtml = html.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+  return `<script>(function(){var t=document.querySelector('[jay-async="${id}:pending"]');if(t){var d=document.createElement('div');d.innerHTML='${escapedHtml}';t.replaceWith(d.firstChild);}window.__jay&&window.__jay.hydrateAsync&&window.__jay.hydrateAsync('${id}');})()<\/script>`;
+}
 const serverModuleCache = /* @__PURE__ */ new Map();
 function invalidateServerElementCache(jayHtmlPath) {
   if (serverModuleCache.delete(jayHtmlPath)) {
@@ -625,6 +678,7 @@ async function generateSSRPageHtml(vite, jayHtmlContent, jayHtmlFilename, jayHtm
   }
   const htmlChunks = [];
   const asyncPromises = [];
+  const asyncOutcomes = [];
   const ctx = {
     write: (chunk) => {
       htmlChunks.push(chunk);
@@ -632,14 +686,20 @@ async function generateSSRPageHtml(vite, jayHtmlContent, jayHtmlFilename, jayHtm
     onAsync: (promise, id, templates) => {
       const asyncPromise = promise.then(
         (val) => {
+          asyncOutcomes.push({ id, status: "resolved", value: val });
           if (templates.resolved) {
-            return templates.resolved(val);
+            return asyncSwapScript(id, templates.resolved(val));
           }
           return "";
         },
         (err) => {
+          asyncOutcomes.push({
+            id,
+            status: "rejected",
+            value: { message: err?.message ?? String(err) }
+          });
           if (templates.rejected) {
-            return templates.rejected(err);
+            return asyncSwapScript(id, templates.rejected(err));
           }
           return "";
         }
@@ -660,16 +720,15 @@ async function generateSSRPageHtml(vite, jayHtmlContent, jayHtmlFilename, jayHtm
     clientInitData2,
     projectInit,
     pluginInits,
-    options
+    options,
+    asyncOutcomes
   );
   const headLinksHtml = cached.headLinks.map((link) => {
     const attrs = Object.entries(link.attributes).map(([k, v]) => ` ${k}="${v}"`).join("");
     return `    <link rel="${link.rel}" href="${link.href}"${attrs} />`;
   }).join("\n");
-  const inlineCss = cached.css ? `    <style>
-${cached.css}
-    </style>` : "";
-  const headExtras = [headLinksHtml, inlineCss].filter((_) => _).join("\n");
+  const cssLink = cached.cssHref ? `    <link rel="stylesheet" href="${cached.cssHref}" />` : "";
+  const headExtras = [headLinksHtml, cssLink].filter((_) => _).join("\n");
   return `<!doctype html>
 <html lang="en">
   <head>
@@ -727,13 +786,27 @@ async function compileAndLoadServerElement(vite, jayHtmlContent, jayHtmlFilename
     vite.moduleGraph.invalidateModule(existingModule);
   }
   const serverModule = await vite.ssrLoadModule(serverElementPath);
+  let cssHref;
+  if (parsedJayFile.css) {
+    const cssFilename = jayHtmlFilename.replace(".jay-html", ".css");
+    const cssPath = path__default.join(serverElementDir, cssFilename);
+    await fs$2.writeFile(cssPath, parsedJayFile.css, "utf-8");
+    const cssModules = vite.moduleGraph.getModulesByFile(cssPath);
+    if (cssModules) {
+      for (const mod of cssModules) {
+        vite.moduleGraph.invalidateModule(mod);
+      }
+    }
+    const hash = crypto.createHash("md5").update(parsedJayFile.css).digest("hex").slice(0, 8);
+    cssHref = "/@fs" + cssPath + "?v=" + hash + "&direct";
+  }
   return {
     renderToStream: serverModule.renderToStream,
     headLinks: parsedJayFile.headLinks,
-    css: parsedJayFile.css
+    cssHref
   };
 }
-function generateHydrationScript(defaultViewState, fastCarryForward, parts, jayHtmlPath, trackByMap = {}, clientInitData2 = {}, projectInit, pluginInits = [], options = {}) {
+function generateHydrationScript(defaultViewState, fastCarryForward, parts, jayHtmlPath, trackByMap = {}, clientInitData2 = {}, projectInit, pluginInits = [], options = {}, asyncOutcomes = []) {
   const {
     partImports,
     compositeParts,
@@ -753,7 +826,7 @@ function generateHydrationScript(defaultViewState, fastCarryForward, parts, jayH
       import { hydrate } from '${hydrateImportPath}';
       ${partImports}${slowViewStateDecl}
       const viewState = ${JSON.stringify(defaultViewState)};
-      const fastCarryForward = ${JSON.stringify(fastCarryForward)};
+${generatePromiseReconstruction(asyncOutcomes)}      const fastCarryForward = ${JSON.stringify(fastCarryForward)};
       const trackByMap = ${JSON.stringify(trackByMap)};
 
       const target = document.getElementById('target');
@@ -1906,7 +1979,7 @@ class SlowRenderCache {
     try {
       const files = await fs$2.readdir(cacheSubDir);
       for (const file of files) {
-        if (file.startsWith(basename) && file.endsWith(".jay-html")) {
+        if (file.startsWith(basename)) {
           try {
             await fs$2.unlink(path__default.join(cacheSubDir, file));
           } catch {
@@ -2402,6 +2475,7 @@ export {
   executePluginServerInits,
   executePluginSetup,
   generateClientScript,
+  generatePromiseReconstruction,
   generateSSRPageHtml,
   getActionCacheHeaders,
   getClientInitData,
@@ -2426,6 +2500,7 @@ export {
   renderFastChangingData,
   resolveActionMetadataPath,
   resolveServices,
+  resolveViewStatePromises,
   runInitCallbacks,
   runLoadParams,
   runShutdownCallbacks,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/stack-server-runtime",
-  "version": "0.15.3",
+  "version": "0.15.5",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.mts",
@@ -26,21 +26,21 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-html": "^0.15.3",
-    "@jay-framework/compiler-shared": "^0.15.3",
-    "@jay-framework/component": "^0.15.3",
-    "@jay-framework/fullstack-component": "^0.15.3",
-    "@jay-framework/logger": "^0.15.3",
-    "@jay-framework/runtime": "^0.15.3",
-    "@jay-framework/ssr-runtime": "^0.15.3",
-    "@jay-framework/stack-route-scanner": "^0.15.3",
-    "@jay-framework/view-state-merge": "^0.15.3",
+    "@jay-framework/compiler-jay-html": "^0.15.5",
+    "@jay-framework/compiler-shared": "^0.15.5",
+    "@jay-framework/component": "^0.15.5",
+    "@jay-framework/fullstack-component": "^0.15.5",
+    "@jay-framework/logger": "^0.15.5",
+    "@jay-framework/runtime": "^0.15.5",
+    "@jay-framework/ssr-runtime": "^0.15.5",
+    "@jay-framework/stack-route-scanner": "^0.15.5",
+    "@jay-framework/view-state-merge": "^0.15.5",
     "yaml": "^2.3.4"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.15.3",
-    "@jay-framework/jay-cli": "^0.15.3",
-    "@jay-framework/stack-client-runtime": "^0.15.3",
+    "@jay-framework/dev-environment": "^0.15.5",
+    "@jay-framework/jay-cli": "^0.15.5",
+    "@jay-framework/stack-client-runtime": "^0.15.5",
     "@types/express": "^5.0.2",
     "@types/node": "^22.15.21",
     "nodemon": "^3.0.3",