@vmz/core 0.1.10 → 0.1.12

package/dist/list-client-components.js

@@ -7,7 +7,7 @@ import fs from 'node:fs';
 import { readdir } from 'node:fs/promises';
 import path from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { componentEntriesFromDeployment, mergeExplicitComponentEntries, readDeploymentDocument, } from './deployment-registry.js';
+import { componentEntriesFromDeployment, dedupeComponentEntriesByTag, mergeExplicitComponentEntries, readDeploymentDocument, } from './deployment-registry.js';
 export { DEPLOYMENT_SCHEMA, readDeploymentDocument, componentEntriesFromDeployment, collectDependsOnClosure, dedupeComponentEntriesByTag, mergeExplicitComponentEntries, loadComponentEntries, importAndRegisterComponentEntries, bootstrapComponentRegistry, } from './deployment-registry.js';
 export { createRenderHost } from './render-host.js';
 /**
@@ -16,14 +16,23 @@ export { createRenderHost } from './render-host.js';
  * @returns {Promise<Array<{ name: string, entry: string, chunkId?: string }>>}
  */
 export async function listClientComponents(dir, opts = {}) {
-    const deployment = readDeploymentDocument(dir, { strict: opts.strict === true });
+    const strict = opts.strict === true;
+    const deployment = readDeploymentDocument(dir, { strict });
     if (deployment) {
-        return componentEntriesFromDeployment(deployment).map((e) => ({
+        return dedupeComponentEntriesByTag(componentEntriesFromDeployment(deployment).map((e) => ({
+            chunkId: e.chunkId,
+            name: e.name,
+            entry: e.entry,
+            source: e.source,
+        })), { strict }).map((e) => ({
             name: e.name,
             entry: e.entry,
             chunkId: e.chunkId,
         }));
     }
+    if (strict) {
+        throw new Error(`vmz: missing vmz-deployment.json under ${dir} (strict deployment mode)`);
+    }
     const folder = path.join(dir, 'components');
     /** @type {string[]} */
     let files = [];
@@ -48,14 +57,23 @@ export async function listClientComponents(dir, opts = {}) {
  * @returns {Array<{ name: string, entry: string, chunkId?: string }>}
  */
 export function listClientComponentsSync(dir, opts = {}) {
-    const deployment = readDeploymentDocument(dir, { strict: opts.strict === true });
+    const strict = opts.strict === true;
+    const deployment = readDeploymentDocument(dir, { strict });
     if (deployment) {
-        return componentEntriesFromDeployment(deployment).map((e) => ({
+        return dedupeComponentEntriesByTag(componentEntriesFromDeployment(deployment).map((e) => ({
+            chunkId: e.chunkId,
+            name: e.name,
+            entry: e.entry,
+            source: e.source,
+        })), { strict }).map((e) => ({
             name: e.name,
             entry: e.entry,
             chunkId: e.chunkId,
         }));
     }
+    if (strict) {
+        throw new Error(`vmz: missing vmz-deployment.json under ${dir} (strict deployment mode)`);
+    }
     const folder = path.join(dir, 'components');
     /** @type {string[]} */
     let files = [];

package/dist/route-layout-chain.d.ts

@@ -0,0 +1,18 @@
+/**
+ * File-route layout chain: Application shell (outermost) + nested page Layout components.
+ */
+/** Chunk id for `src/Application.vmz` emit (`Application.client.js`). */
+export declare const APPLICATION_SHELL_CHUNK = "Application";
+/**
+ * True when the compile output includes a root Application shell.
+ */
+export declare function hasApplicationShell(distDir: string): boolean;
+/**
+ * Nearest page Layout.client.js walking up from the page chunk (outer to inner).
+ * Does not include Application — use resolveRouteLayoutChain.
+ */
+export declare function resolveNestedLayoutChain(distDir: string, pageChunkId: string): string[];
+/**
+ * Full SSR / hydrate layout chain: optional Application shell, then nested page layouts.
+ */
+export declare function resolveRouteLayoutChain(distDir: string, pageChunkId: string): string[];

package/dist/route-layout-chain.js

@@ -0,0 +1,41 @@
+/**
+ * File-route layout chain: Application shell (outermost) + nested page Layout components.
+ */
+import { existsSync } from 'node:fs';
+import path from 'node:path';
+/** Chunk id for `src/Application.vmz` emit (`Application.client.js`). */
+export const APPLICATION_SHELL_CHUNK = 'Application';
+/**
+ * True when the compile output includes a root Application shell.
+ */
+export function hasApplicationShell(distDir) {
+    return existsSync(path.join(distDir, `${APPLICATION_SHELL_CHUNK}.client.js`));
+}
+/**
+ * Nearest page Layout.client.js walking up from the page chunk (outer to inner).
+ * Does not include Application — use resolveRouteLayoutChain.
+ */
+export function resolveNestedLayoutChain(distDir, pageChunkId) {
+    const rel = pageChunkId.replace(/^pages\//, '');
+    const parts = rel.split('/').filter(Boolean);
+    parts.pop();
+    const chain = [];
+    for (let i = parts.length; i >= 0; i--) {
+        const dirParts = parts.slice(0, i);
+        const layoutChunk = ['pages', ...dirParts, 'Layout'].join('/');
+        if (existsSync(path.join(distDir, `${layoutChunk}.client.js`))) {
+            chain.unshift(layoutChunk);
+        }
+    }
+    return chain;
+}
+/**
+ * Full SSR / hydrate layout chain: optional Application shell, then nested page layouts.
+ */
+export function resolveRouteLayoutChain(distDir, pageChunkId) {
+    const chain = resolveNestedLayoutChain(distDir, pageChunkId);
+    if (hasApplicationShell(distDir)) {
+        chain.unshift(APPLICATION_SHELL_CHUNK);
+    }
+    return chain;
+}

package/dist/serve-host.mjs

@@ -22,8 +22,9 @@ import http from 'node:http';
 import { createRequire, registerHooks } from 'node:module';
 import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import { registerComponents, renderToStream, renderToString } from './vmz-dom.js';
+import { createRenderHost } from './render-host.js';
 import { listClientComponents } from './list-client-components.js';
+import { resolveRouteLayoutChain } from './route-layout-chain.js';
 import { handleNodeRequest, setRoutes, setServerModuleResolver } from './vmz-runtime.js';
 const require = createRequire(import.meta.url);
 const distDir = process.env.VMZ_DIST ? path.resolve(process.env.VMZ_DIST) : path.dirname(fileURLToPath(import.meta.url));
@@ -76,6 +77,8 @@ if (isDev) {
 }
 /** @type {number} */
 let reloadToken = Date.now();
+/** @type {Awaited<ReturnType<typeof createRenderHost>> | null} */
+let ssrRenderHost = null;
 /** @type {string | null} Correlatable build id from vmz dev (Living §12.8). */
 let lastDevBuildId = null;
 /** @type {Array<{ chunkId: string, pageRel: string, segs: ReturnType<typeof parseChunkSegments> }>} */
@@ -84,6 +87,8 @@ let pageCatalog = [];
 const pageCtors = new Map();
 /** Stylesheet from deployment `cssEntry` (e.g. vmz.css). */
 let cssEntry = null;
+/** Fingerprint of style inputs — busts `@import` siblings when tokens change (VMZ-8). */
+let styleBundleHash = null;
 /** @type {{ defaultThemeId: string, themeIds: string[], activationAttr: string, contentHash: string|null } | null} */
 let styleTheme = null;
 /** Locale route realization artifact from `_vmz/locale-route-realization.json` (optional). */
@@ -277,7 +282,7 @@ async function renderPageStream(pathname, opts = {}) {
     const resumeEntries = await loadPageResumeEntries(distDir, match.chunkId);
     const strategies = resumeEntries.map((e) => e.strategy);
     const eventOnlyShell = isEventOnlyShell(strategies);
-    const layoutChain = resolveLayoutChain(match.chunkId);
+    const layoutChain = resolveRouteLayoutChain(distDir, match.chunkId);
     return {
         status,
         stream: emitPageHtml(Page, match.chunkId, eventOnlyShell, props, opts, layoutChain, localeCtx),
@@ -503,9 +508,17 @@ async function* emitPageHtml(Page, chunkId, eventOnlyShell, props = {}, opts = {
     const pageDocMeta = resolvePageDocumentMeta(Page);
     const prevLocaleHint = globalThis.__vmzLocaleIdHint;
     globalThis.__vmzLocaleIdHint = localeId;
+    if (!ssrRenderHost) {
+        ssrRenderHost = await createRenderHost(distDir, {
+            strictDeployment: !isDev,
+            preload: 'none',
+            cacheBust: reloadToken,
+        });
+    }
+    await ssrRenderHost.ensureComponents([chunkId, ...layoutChain]);
     let bodyHtml = '';
     try {
-        for await (const chunk of renderToStream(Page, props, { signal })) {
+        for await (const chunk of ssrRenderHost.renderToStream(Page, props, { signal })) {
             if (signal?.aborted)
                 return;
             bodyHtml += chunk;
@@ -517,7 +530,7 @@ async function* emitPageHtml(Page, chunkId, eventOnlyShell, props = {}, opts = {
             const Layout = await loadPageCtor(layoutChain[i]);
             if (!Layout)
                 continue;
-            bodyHtml = await renderToString(Layout, {}, { signal, slotHtml: bodyHtml });
+            bodyHtml = await ssrRenderHost.renderToString(Layout, {}, { signal, slotHtml: bodyHtml });
             if (signal?.aborted)
                 return;
         }
@@ -539,7 +552,7 @@ async function* emitPageHtml(Page, chunkId, eventOnlyShell, props = {}, opts = {
         throw new Error('vmz native addon missing generatePageShell — rebuild with `pnpm napi:build`');
     }
     const entrySrc = `/${eventOnlyShell ? 'entry-event.js' : 'entry-client.js'}?t=${reloadToken}`;
-    const cssHref = cssEntry ? `${String(cssEntry).replace(/^\/+/, '')}?t=${reloadToken}` : undefined;
+    const cssHref = cssEntryWithBust(cssEntry);
     yield native.generatePageShell({
         bodyHtml,
         chunkId,
@@ -709,28 +722,18 @@ async function softReload(opts = {}) {
         catch {
             localeArtifact = null;
         }
-        const componentEntries = await listClientComponents(distDir);
+        const componentEntries = await listClientComponents(distDir, { strict: !isDev });
+        ssrRenderHost = await createRenderHost(distDir, {
+            strictDeployment: !isDev,
+            preload: 'none',
+            cacheBust: nextToken,
+        });
         const nextCatalog = await listPageClientFiles(distDir);
         if (!nextCatalog.length) {
             throw new Error(`vmz serve: no pages/**/*.client.js in ${distDir}`);
         }
-        /** @type {Record<string, any>} */
-        const components = {};
         /** @type {Map<string, any>} */
         const nextCtors = new Map();
-        const affectedNames = new Set(affected
-            .map((c) => String(c))
-            .filter((c) => c.startsWith('components/') || !c.includes('/'))
-            .map((c) => c.split('/').pop())
-            .filter(Boolean));
-        for (const entry of componentEntries) {
-            if (islandHmr && affectedNames.size > 0 && !affectedNames.has(entry.name)) {
-                continue;
-            }
-            const href = bustUrl(pathToFileURL(path.join(distDir, entry.entry)).href);
-            const mod = await import(href);
-            components[entry.name] = mod.default;
-        }
         if (!islandHmr) {
             const pagesToLoad = reloadAllPages ? nextCatalog : nextCatalog.filter((p) => pageNeedsReload(p.chunkId, affected));
             for (const p of pagesToLoad) {
@@ -758,13 +761,11 @@ async function softReload(opts = {}) {
                 }
             }
         }
-        if (Object.keys(components).length) {
-            registerComponents(components);
-        }
         const indexChunk = pageCatalog.find((p) => p.chunkId === 'pages/index')?.chunkId || pageCatalog[0].chunkId;
         const resumeEntries = await loadPageResumeEntries(distDir, indexChunk);
         const styleMeta = await loadDeploymentStyle(distDir);
         cssEntry = styleMeta.cssEntry;
+        styleBundleHash = styleMeta.styleBundleHash;
         styleTheme = styleMeta.styleTheme;
         const lazyEventNames = resumeEntries
             .filter((e) => isEventStrategy(e.strategy))
@@ -1205,32 +1206,6 @@ function isRouteGroupDir(seg) {
 function isRouteBoundaryStem(stem) {
     return stem === 'Layout' || stem === 'Loading' || stem === 'Error' || stem === 'NotFound';
 }
-/**
- * Nearest `Layout.client.js` walking up from the page chunk (outer→inner).
- * @param {string} pageChunkId
- * @returns {string[]}
- */
-function resolveLayoutChain(pageChunkId) {
-    const rel = pageChunkId.replace(/^pages\//, '');
-    const parts = rel.split('/').filter(Boolean);
-    parts.pop(); // page stem
-    /** @type {string[]} */
-    const chain = [];
-    for (let i = parts.length; i >= 0; i--) {
-        const dirParts = parts.slice(0, i);
-        const layoutChunk = ['pages', ...dirParts, 'Layout'].join('/');
-        const abs = path.join(distDir, `${layoutChunk}.client.js`);
-        try {
-            // sync existence — layouts are compile artifacts next to pages
-            if (existsSync(abs))
-                chain.unshift(layoutChunk);
-        }
-        catch {
-            /* ignore */
-        }
-    }
-    return chain;
-}
 /**
  * @param {string} pathname
  * @param {typeof pageCatalog} catalog
@@ -1442,6 +1417,20 @@ function requireNativeGenerator() {
 const THEME_STORE_KEY = 'vmz-theme';
 /** Host preference key for `routing.strategy: 'none'` (cookie + localStorage). */
 const LOCALE_STORE_KEY = 'vmz.locale';
+/**
+ * Cache-bust stylesheet entry for dev reload (token + serve revision).
+ * @param {string | null | undefined} entry
+ */
+function cssEntryWithBust(entry) {
+    if (!entry)
+        return undefined;
+    const base = String(entry).replace(/^\/+/, '');
+    const params = new URLSearchParams();
+    params.set('t', String(reloadToken));
+    if (styleBundleHash)
+        params.set('h', styleBundleHash);
+    return `${base}?${params.toString()}`;
+}
 /**
  * @param {string} dir
  * @returns {Promise<{ cssEntry: string|null, styleTheme: typeof styleTheme, styleBundleHash: string|null }>}

package/dist/server.js

@@ -231,7 +231,9 @@ export async function handleNodeRequest(req, res, opts = {}) {
         if (verb === 'GET' && opts.distDir) {
             const nodePath = await import('node:path');
             const { readFile, stat } = await import('node:fs/promises');
-            const file = await resolveDistStatic(opts.distDir, url.pathname, nodePath, stat);
+            const file = await resolveDistStatic(opts.distDir, url.pathname, nodePath, stat, {
+                cookieHeader: String(req.headers.cookie || ''),
+            });
             const hasSsr = typeof opts.renderPageStream === 'function' ||
                 typeof opts.renderPage === 'function' ||
                 typeof opts.renderIndexStream === 'function' ||
@@ -749,9 +751,15 @@ async function sendHtmlStream(res, status, source, signal) {
  * @param {string} type
  */
 function sendBytes(res, status, body, type) {
-    res.writeHead(status, {
+    /** @type {Record<string, string | number>} */
+    const headers = {
         'content-type': type,
         'content-length': body.byteLength,
-    });
+    };
+    // Dev: stylesheets are rebuilt in-place — never cache @import siblings (VMZ-8).
+    if (process.env.VMZ_DEV === '1' && typeof type === 'string' && type.startsWith('text/css')) {
+        headers['cache-control'] = 'no-store';
+    }
+    res.writeHead(status, headers);
     res.end(body);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vmz/core",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "type": "module",
   "description": "VMZ production runtime core — DOM / SSR / HTTP / WriteBarrier (no compiler)",
   "exports": {
@@ -35,6 +35,10 @@
     "./render-host": {
       "types": "./dist/render-host.d.ts",
       "default": "./dist/render-host.js"
+    },
+    "./route-layout-chain": {
+      "types": "./dist/route-layout-chain.d.ts",
+      "default": "./dist/route-layout-chain.js"
     }
   },
   "files": [