@vistagenic/vista 0.2.4 → 0.2.6

package/dist/server/engine.js

@@ -276,10 +276,15 @@ function startServer(port = 3003, compiler) {
             }, 100);
         };
         // Push compile errors to browser via SSE
-        const pushCompileError = (errorMessage) => {
+        const pushCompileError = (errorMessages) => {
+            const normalized = (Array.isArray(errorMessages) ? errorMessages : [])
+                .map((entry) => String(entry || '').trim())
+                .filter(Boolean);
+            const fallback = normalized.length > 0 ? normalized.join('\n\n') : 'Unknown build error.';
             const errorData = JSON.stringify({
                 type: 'error',
-                message: errorMessage,
+                message: fallback,
+                errors: normalized.length > 0 ? normalized : [fallback],
             });
             sseClients.forEach((client) => {
                 client.write(`data: ${errorData}\n\n`);
@@ -296,9 +301,17 @@ function startServer(port = 3003, compiler) {
         compiler.hooks.done.tap('VistaSSE', (stats) => {
             if (stats.hasErrors()) {
                 const errors = stats.toJson().errors || [];
-                const errorMessage = errors.map((e) => (typeof e === 'string' ? e : e.message)).join('\n');
+                const errorMessages = errors
+                    .map((e) => {
+                    if (typeof e === 'string')
+                        return e;
+                    if (e && typeof e.message === 'string')
+                        return e.message;
+                    return String(e || '');
+                })
+                    .filter((entry) => entry.trim().length > 0);
                 (0, logger_1.logEvent)('Build error detected, pushing to browser...');
-                pushCompileError(errorMessage);
+                pushCompileError(errorMessages);
             }
             else {
                 pushBuildSuccess();

package/dist/server/rsc-engine.js

@@ -296,6 +296,41 @@ function normalizeSSRManifest(manifest) {
     }
     const moduleMap = manifest.moduleMap;
     const aliasEntries = [];
+    const pushAlias = (key, exportsMap) => {
+        if (!key)
+            return;
+        aliasEntries.push([key, exportsMap]);
+        // React Flight may request module IDs with/without a trailing '#'.
+        if (key.endsWith('#')) {
+            aliasEntries.push([key.slice(0, -1), exportsMap]);
+        }
+        else {
+            aliasEntries.push([`${key}#`, exportsMap]);
+        }
+        // Normalize URI encoding variants for Windows paths with spaces, etc.
+        if (key.startsWith('file://')) {
+            try {
+                const decoded = decodeURI(key);
+                if (decoded !== key) {
+                    aliasEntries.push([decoded, exportsMap]);
+                    aliasEntries.push([decoded.endsWith('#') ? decoded.slice(0, -1) : `${decoded}#`, exportsMap]);
+                }
+            }
+            catch {
+                // ignore decode failures
+            }
+            try {
+                const encoded = encodeURI(key);
+                if (encoded !== key) {
+                    aliasEntries.push([encoded, exportsMap]);
+                    aliasEntries.push([encoded.endsWith('#') ? encoded.slice(0, -1) : `${encoded}#`, exportsMap]);
+                }
+            }
+            catch {
+                // ignore encode failures
+            }
+        }
+    };
     for (const [moduleKey, exportsMap] of Object.entries(moduleMap)) {
         const normalizedExports = {};
         for (const [exportName, rawEntry] of Object.entries(exportsMap || {})) {
@@ -308,10 +343,10 @@ function normalizeSSRManifest(manifest) {
             };
         }
         moduleMap[moduleKey] = normalizedExports;
-        aliasEntries.push([moduleKey, normalizedExports]);
+        pushAlias(moduleKey, normalizedExports);
         for (const normalizedEntry of Object.values(normalizedExports)) {
             const aliasKey = String(normalizedEntry.id);
-            aliasEntries.push([aliasKey, normalizedExports]);
+            pushAlias(aliasKey, normalizedExports);
         }
     }
     for (const [aliasKey, exportsMap] of aliasEntries) {
@@ -688,6 +723,55 @@ function wrapInDocumentShell(bodyContent, metadataHtml, chunkFiles, rootMode) {
 </body>
 </html>`;
 }
+function normalizeWebpackErrors(stats) {
+    const errors = stats.toJson().errors || [];
+    const normalizedErrors = errors
+        .map((entry) => {
+        if (typeof entry === 'string')
+            return entry;
+        if (entry && typeof entry.message === 'string')
+            return entry.message;
+        return String(entry || '');
+    })
+        .filter((entry) => entry.trim().length > 0);
+    if (normalizedErrors.length > 0) {
+        return normalizedErrors;
+    }
+    return ['Unknown build error.'];
+}
+function renderCompilePendingHTML() {
+    return `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>Compiling...</title>
+  <style>
+    html,body{height:100%;margin:0}
+    body{
+      display:grid;
+      place-items:center;
+      font-family:ui-sans-serif,system-ui,-apple-system,'Segoe UI',sans-serif;
+      background:#09090b;
+      color:#f4f4f5;
+    }
+    .vista-dev-pending{
+      padding:20px 24px;
+      border-radius:14px;
+      border:1px solid rgba(255,255,255,0.15);
+      background:rgba(17,17,20,0.92);
+      box-shadow:0 18px 42px rgba(0,0,0,0.4);
+      font-size:14px;
+      letter-spacing:0.01em;
+    }
+  </style>
+</head>
+<body>
+  <div class="vista-dev-pending">Vista is compiling the client bundle. Retrying...</div>
+  <script>setTimeout(function(){window.location.reload();},700);</script>
+</body>
+</html>`;
+}
 function startRSCServer(options = {}) {
     const app = (0, express_1.default)();
     const cwd = process.cwd();
@@ -847,6 +931,8 @@ function startRSCServer(options = {}) {
     // - Pushes compile errors/success from webpack client build
     // ========================================================================
     const sseReloadClients = new Set();
+    let clientCompileState = isDev && options.compiler ? 'compiling' : 'ready';
+    let clientCompileErrors = [];
     if (isDev) {
         app.get(constants_1.SSE_ENDPOINT, (req, res) => {
             res.setHeader('Content-Type', 'text/event-stream');
@@ -935,15 +1021,27 @@ function startRSCServer(options = {}) {
             writeToDisk: true,
         }));
         // No webpack-hot-middleware — Vista uses SSE live-reload for RSC
+        options.compiler.hooks.invalid.tap('VistaRSCCompileStateInvalid', () => {
+            clientCompileState = 'compiling';
+            clientCompileErrors = [];
+        });
         // Push compile errors/success to SSE clients
         options.compiler.hooks.done.tap('VistaRSCLiveReload', (stats) => {
             if (stats.hasErrors()) {
-                const errors = stats.toJson().errors || [];
-                const msg = errors.map((e) => (typeof e === 'string' ? e : e.message)).join('\n');
-                const payload = JSON.stringify({ type: 'error', message: msg });
+                const normalizedErrors = normalizeWebpackErrors(stats);
+                const fallback = normalizedErrors.join('\n\n');
+                clientCompileState = 'error';
+                clientCompileErrors = normalizedErrors;
+                const payload = JSON.stringify({
+                    type: 'error',
+                    message: fallback,
+                    errors: normalizedErrors,
+                });
                 sseReloadClients.forEach((c) => c.write(`data: ${payload}\n\n`));
             }
             else {
+                clientCompileState = 'ready';
+                clientCompileErrors = [];
                 const payload = JSON.stringify({ type: 'ok' });
                 sseReloadClients.forEach((c) => c.write(`data: ${payload}\n\n`));
             }
@@ -1031,6 +1129,16 @@ function startRSCServer(options = {}) {
     app.use(constants_1.URL_PREFIX, express_1.default.static(path_1.default.join(cwd, constants_1.BUILD_DIR)));
     app.use(express_1.default.static(path_1.default.join(cwd, constants_1.BUILD_DIR)));
     const proxyRSCRequest = async (req, res) => {
+        if (isDev && options.compiler) {
+            if (clientCompileState === 'compiling') {
+                res.status(503).type('text/plain').send('[vista] Client bundle is compiling. Retry shortly.');
+                return;
+            }
+            if (clientCompileState === 'error') {
+                res.status(500).type('text/plain').send(clientCompileErrors.join('\n\n'));
+                return;
+            }
+        }
         try {
             const fetchOptions = {
                 method: req.method,
@@ -1122,6 +1230,19 @@ function startRSCServer(options = {}) {
                 .send((0, dev_error_1.renderErrorHTML)([errorInfo]));
             return;
         }
+        if (isDev && options.compiler) {
+            if (clientCompileState === 'compiling') {
+                res.status(503).type('text/html').send(renderCompilePendingHTML());
+                return;
+            }
+            if (clientCompileState === 'error') {
+                const errorInfos = (clientCompileErrors.length > 0
+                    ? clientCompileErrors
+                    : ['Unknown client build error.']).map((message) => ({ type: 'build', message }));
+                res.status(500).type('text/html').send((0, dev_error_1.renderErrorHTML)(errorInfos));
+                return;
+            }
+        }
         if (req.path.startsWith('/api/')) {
             await handleApiRoute(req, res, cwd, isDev, typedApiConfig);
             return;

package/dist/server/static-generator.js

@@ -16,6 +16,7 @@ exports.generateStaticPages = generateStaticPages;
 exports.revalidatePath = revalidatePath;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
+const constants_1 = require("../constants");
 const static_cache_1 = require("./static-cache");
 const CjsModule = require('module');
 let staticRuntimeReady = false;
@@ -181,6 +182,21 @@ async function prerenderPage(urlPath, route, params, cwd) {
     try {
         const React = require('react');
         const { renderToString } = require('react-dom/server');
+        const isAsyncComponent = (component) => {
+            return (typeof component === 'function' &&
+                component.constructor &&
+                component.constructor.name === 'AsyncFunction');
+        };
+        const renderComponent = async (component, props, child) => {
+            if (isAsyncComponent(component)) {
+                const asyncProps = child === undefined ? props : { ...props, children: child };
+                return component(asyncProps);
+            }
+            if (child === undefined) {
+                return React.createElement(component, props);
+            }
+            return React.createElement(component, props, child);
+        };
         // Load page component from webpack-built server bundle
         const pageModule = require(route.pagePath);
         const PageComponent = pageModule.default;
@@ -188,15 +204,50 @@ async function prerenderPage(urlPath, route, params, cwd) {
             console.warn(`[vista:ssg] No default export in ${route.pagePath}`);
             return null;
         }
+        let metadata = {};
+        const searchParams = {};
+        for (const layoutPath of route.layoutPaths) {
+            try {
+                const layoutModule = require(layoutPath);
+                if (layoutModule?.metadata && typeof layoutModule.metadata === 'object') {
+                    metadata = { ...metadata, ...layoutModule.metadata };
+                }
+            }
+            catch {
+                // Ignore layout metadata failures for static generation.
+            }
+        }
+        if (pageModule.metadata && typeof pageModule.metadata === 'object') {
+            metadata = { ...metadata, ...pageModule.metadata };
+        }
+        if (typeof pageModule.generateMetadata === 'function') {
+            try {
+                const dynamicMeta = await pageModule.generateMetadata({ params: params || {}, searchParams }, metadata);
+                if (dynamicMeta && typeof dynamicMeta === 'object') {
+                    metadata = { ...metadata, ...dynamicMeta };
+                }
+            }
+            catch (metadataError) {
+                console.warn(`[vista:ssg] generateMetadata failed for ${urlPath}:`, metadataError?.message || String(metadataError));
+            }
+        }
+        let metadataHtml = '';
+        try {
+            const { generateMetadataHtml } = require('../metadata/generate');
+            metadataHtml = generateMetadataHtml(metadata);
+        }
+        catch {
+            metadataHtml = '';
+        }
         // Build the element, passing params as props
-        let element = React.createElement(PageComponent, { params: params || {} });
+        let element = await renderComponent(PageComponent, { params: params || {} });
         // Wrap in layouts (outside-in)
         for (let i = route.layoutPaths.length - 1; i >= 0; i--) {
             try {
                 const layoutModule = require(route.layoutPaths[i]);
                 const LayoutComponent = layoutModule.default;
                 if (LayoutComponent) {
-                    element = React.createElement(LayoutComponent, { params: params || {}, searchParams: {} }, element);
+                    element = await renderComponent(LayoutComponent, { params: params || {}, searchParams: {} }, element);
                 }
             }
             catch {
@@ -206,7 +257,7 @@ async function prerenderPage(urlPath, route, params, cwd) {
         // Render to HTML string
         const html = renderToString(element);
         return {
-            html: wrapInDocument(html, urlPath),
+            html: wrapInDocument(html, urlPath, metadataHtml, cwd),
             generatedAt: Date.now(),
             revalidate: route.revalidate || 0,
             routePattern: route.pattern,
@@ -221,17 +272,49 @@ async function prerenderPage(urlPath, route, params, cwd) {
 /**
  * Wrap rendered HTML in a basic document shell.
  */
-function wrapInDocument(bodyHtml, _urlPath) {
-    return `<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <link rel="stylesheet" href="/styles.css" />
-</head>
-<body>
-  <div id="root">${bodyHtml}</div>
-</body>
+function injectBeforeClosingTag(html, tagName, injection) {
+    const closeTag = `</${tagName}>`;
+    if (html.includes(closeTag)) {
+        return html.replace(closeTag, `${injection}\n${closeTag}`);
+    }
+    return html;
+}
+function getCSSLinks(cwd) {
+    const links = ['<link rel="stylesheet" href="/styles.css" />'];
+    const chunksDir = path_1.default.join(cwd, constants_1.BUILD_DIR, 'static', 'chunks');
+    try {
+        if (fs_1.default.existsSync(chunksDir)) {
+            const files = fs_1.default.readdirSync(chunksDir).filter((entry) => entry.endsWith('.css'));
+            for (const file of files) {
+                links.push(`<link rel="stylesheet" href="${constants_1.STATIC_CHUNKS_PATH}${file}" />`);
+            }
+        }
+    }
+    catch {
+        // Ignore CSS discovery failures during static generation.
+    }
+    return links.join('\n  ');
+}
+function wrapInDocument(bodyHtml, _urlPath, metadataHtml, cwd) {
+    const headInjection = `\n  <meta charset="utf-8" />\n  <meta name="viewport" content="width=device-width, initial-scale=1" />\n  ${metadataHtml}\n  ${getCSSLinks(cwd)}`;
+    const hasDocumentMarkup = /<html(?:\s|>)/i.test(bodyHtml) && /<\/html>/i.test(bodyHtml);
+    if (hasDocumentMarkup) {
+        const htmlStart = bodyHtml.search(/<html(?:\s|>)/i);
+        let html = htmlStart > 0 ? bodyHtml.slice(htmlStart) : bodyHtml;
+        if (!/^\s*<!doctype html>/i.test(html)) {
+            html = `<!DOCTYPE html>\n${html}`;
+        }
+        html = injectBeforeClosingTag(html, 'head', headInjection);
+        return html;
+    }
+    return `<!DOCTYPE html>
+<html lang="en">
+<head>
+  ${headInjection}
+</head>
+<body>
+  <div id="root">${bodyHtml}</div>
+</body>
 </html>`;
 }
 // ---------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vistagenic/vista",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "The React Framework for Visionaries - Rust-powered SSR with Server Components",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -132,6 +132,5 @@
     "@types/webpack": "^5.28.5",
     "@types/webpack-hot-middleware": "^2.25.9",
     "typescript": "^5.7.2"
-  },
-  "gitHead": "9fac2fe1ed23e51248ba8bcecbd623b9e3a3b520"
+  }
 }