@vmz/vmz 0.3.7 → 0.3.8

package/dist/document/document-build.js

@@ -66,7 +66,7 @@ export async function buildDocuments(opts) {
         assertIntegratedDistReady(appDistDir);
     }
     fs.mkdirSync(outDir, { recursive: true });
-    const designs = resolveDocumentDesignsCss(projectRoot);
+    const designs = resolveDocumentDesignsCss(projectRoot, appDistDir);
     let designsHref = null;
     if (designs.css && designs.href) {
         const cssPath = path.join(outDir, designs.href);

package/dist/document/document-designs.d.ts

@@ -3,4 +3,4 @@ export interface DocumentDesignsCssResult {
     source: string | null;
     href: string | null;
 }
-export declare function resolveDocumentDesignsCss(projectRoot: string): DocumentDesignsCssResult;
+export declare function resolveDocumentDesignsCss(projectRoot: string, appDistDir?: string | null): DocumentDesignsCssResult;

package/dist/document/document-designs.js

@@ -1,18 +1,25 @@
 /**
- * Document — wire project `/designs` into static document assets.
- * Prefer compiled `vmz-designs.css` / `vmz.css`; else emit a minimal token CSS.
+ * Document — wire project `/designs` and the compiled app stylesheet into
+ * static document assets.
+ *
+ * Layout chrome comes from `designs/document/chrome.css`. Theme tokens are not
+ * re-derived here: they come from the app build output (`vmz-designs.css` /
+ * `vmz.css` under `appDistDir`), which is the single compiled artifact.
  */
 import fs from 'node:fs';
 import path from 'node:path';
-export function resolveDocumentDesignsCss(projectRoot) {
+export function resolveDocumentDesignsCss(projectRoot, appDistDir) {
     const designsDir = path.join(projectRoot, 'designs');
     if (!fs.existsSync(designsDir) || !fs.statSync(designsDir).isDirectory()) {
         return { css: '', source: null, href: null };
     }
     const parts = [];
     const sources = [];
-    // Layout first so @import (fonts) stays at stylesheet top; theme tokens follow.
-    const layoutCandidates = [path.join(designsDir, 'document', 'chrome.css'), path.join(designsDir, 'styles', 'document.css')];
+    // Layout first so @import stays at stylesheet top; compiled tokens follow.
+    const layoutCandidates = [
+        path.join(designsDir, 'document', 'chrome.css'),
+        path.join(designsDir, 'styles', 'document.css'),
+    ];
     for (const p of layoutCandidates) {
         if (!fs.existsSync(p))
             continue;
@@ -20,122 +27,27 @@ export function resolveDocumentDesignsCss(projectRoot) {
         sources.push(path.relative(projectRoot, p).replace(/\\/g, '/'));
         break;
     }
-    const distCandidates = [path.join(projectRoot, 'dist', 'vmz-designs.css'), path.join(projectRoot, 'dist', 'vmz.css')];
-    for (const p of distCandidates) {
-        if (fs.existsSync(p)) {
-            parts.push(fs.readFileSync(p, 'utf8'));
-            sources.push(path.relative(projectRoot, p).replace(/\\/g, '/'));
-            break;
+    if (appDistDir) {
+        const compiled = [path.join(appDistDir, 'vmz-designs.css'), path.join(appDistDir, 'vmz.css')].find((p) => fs.existsSync(p));
+        if (!compiled) {
+            throw new Error(`vmz.document: app dist ${appDistDir} is missing vmz-designs.css / vmz.css; build the app before the documents`);
         }
-    }
-    if (parts.length) {
-        return {
-            css: parts.join('\n\n'),
-            source: sources.join('+'),
-            href: 'assets/vmz-designs.css',
-        };
-    }
-    const styleCandidates = [path.join(designsDir, 'styles', 'index.css')];
-    for (const p of styleCandidates) {
-        if (fs.existsSync(p)) {
-            return {
-                css: fs.readFileSync(p, 'utf8'),
-                source: path.relative(projectRoot, p).replace(/\\/g, '/'),
-                href: 'assets/vmz-designs.css',
-            };
+        parts.push(fs.readFileSync(compiled, 'utf8'));
+        sources.push(path.relative(projectRoot, compiled).replace(/\\/g, '/'));
+    }
+    else {
+        const entry = path.join(designsDir, 'styles', 'index.css');
+        if (fs.existsSync(entry)) {
+            parts.push(fs.readFileSync(entry, 'utf8'));
+            sources.push(path.relative(projectRoot, entry).replace(/\\/g, '/'));
         }
     }
-    const emitted = emitMinimalDesignsCss(designsDir);
-    if (emitted) {
-        return { css: emitted, source: 'designs/', href: 'assets/vmz-designs.css' };
-    }
-    return { css: '', source: 'designs/', href: null };
-}
-function emitMinimalDesignsCss(designsDir) {
-    const vars = {};
-    const tokenDir = path.join(designsDir, 'tokens');
-    if (fs.existsSync(tokenDir)) {
-        walkJson(tokenDir, (obj, prefix) => {
-            collectStyleThemeEntries(obj, vars);
-            flattenTokens(obj, prefix, vars);
-        });
-    }
-    const themeJson = path.join(designsDir, 'theme.json');
-    if (fs.existsSync(themeJson)) {
-        try {
-            const theme = JSON.parse(fs.readFileSync(themeJson, 'utf8'));
-            collectStyleThemeEntries(theme, vars);
-            flattenTokens(theme, '', vars);
-        }
-        catch {
-            /* ignore */
-        }
-    }
-    const keys = Object.keys(vars).sort();
-    if (!keys.length) {
-        // Presence of /designs still warrants a readable baseline sheet.
-        return `/* vmz.document designs baseline */\n:root { color-scheme: light; }\nbody { font-family: system-ui, sans-serif; line-height: 1.5; margin: 0; }\nmain { max-width: 48rem; margin: 0 auto; padding: 1.5rem; }\nnav { padding: 1rem 1.5rem; border-bottom: 1px solid #ddd; }\n`;
-    }
-    const lines = keys.map((k) => `  ${cssVar(k)}: ${vars[k]};`);
-    return `/* vmz.document designs from /designs */\n:root {\n${lines.join('\n')}\n}\nbody { font-family: var(--font-sans, system-ui, sans-serif); line-height: 1.5; margin: 0; color: var(--color-fg, #111); background: var(--color-bg, #fff); }\nmain { max-width: 48rem; margin: 0 auto; padding: 1.5rem; }\nnav { padding: 1rem 1.5rem; border-bottom: 1px solid var(--color-border, #ddd); }\n`;
-}
-function cssVar(key) {
-    const name = String(key)
-        .replace(/[^a-zA-Z0-9_-]+/g, '-')
-        .replace(/^-|-$/g, '');
-    return `--${name}`;
-}
-/** Style Theme entries (`key.path` + `value`) → `vmz-*` CSS vars (same naming as application compile). */
-function collectStyleThemeEntries(obj, out) {
-    if (obj == null || typeof obj !== 'object' || Array.isArray(obj))
-        return;
-    const entries = obj.entries;
-    if (!Array.isArray(entries))
-        return;
-    for (const e of entries) {
-        const pathParts = e?.key?.path;
-        if (!Array.isArray(pathParts) || pathParts.length === 0)
-            continue;
-        if (typeof e.value !== 'string' && typeof e.value !== 'number')
-            continue;
-        const dotted = pathParts.map(String).join('-');
-        out[`vmz-${dotted}`] = String(e.value);
-    }
-}
-function flattenTokens(obj, prefix, out) {
-    if (obj == null || typeof obj !== 'object' || Array.isArray(obj))
-        return;
-    for (const [k, v] of Object.entries(obj)) {
-        if (k === 'entries')
-            continue;
-        const key = prefix ? `${prefix}-${k}` : k;
-        if (v != null && typeof v === 'object' && !Array.isArray(v)) {
-            if ('value' in v && (typeof v.value === 'string' || typeof v.value === 'number')) {
-                out[key] = String(v.value);
-            }
-            else {
-                flattenTokens(v, key, out);
-            }
-        }
-        else if (typeof v === 'string' || typeof v === 'number') {
-            out[key] = String(v);
-        }
-    }
-}
-function walkJson(dir, fn) {
-    if (!fs.existsSync(dir))
-        return;
-    for (const ent of fs.readdirSync(dir, { withFileTypes: true })) {
-        const full = path.join(dir, ent.name);
-        if (ent.isDirectory())
-            walkJson(full, fn);
-        else if (ent.isFile() && ent.name.endsWith('.json')) {
-            try {
-                fn(JSON.parse(fs.readFileSync(full, 'utf8')), '');
-            }
-            catch {
-                /* ignore */
-            }
-        }
+    if (!parts.length) {
+        return { css: '', source: 'designs/', href: null };
     }
+    return {
+        css: parts.join('\n\n'),
+        source: sources.join('+'),
+        href: 'assets/vmz-designs.css',
+    };
 }

package/package.json

@@ -3,23 +3,23 @@
     "vmz": "./bin/vmz.js"
   },
   "dependencies": {
-    "@vmz/commander": "0.3.7",
-    "@vmz/core": "0.3.7",
-    "@vmz/diagnostic": "0.3.7",
-    "@vmz/plugin": "0.3.7",
-    "@vmz/protocol": "0.3.7"
+    "@vmz/commander": "0.3.8",
+    "@vmz/core": "0.3.8",
+    "@vmz/diagnostic": "0.3.8",
+    "@vmz/plugin": "0.3.8",
+    "@vmz/protocol": "0.3.8"
   },
   "description": "VMZ Node toolchain — N-API workspace session + CLI (publish name @vmz/vmz)",
   "devDependencies": {
     "@types/node": "^22.15.0",
-    "@vmz/plugin": "0.3.7",
-    "@vmz/plugin-katex": "0.3.7",
-    "@vmz/plugin-markdown-it": "0.3.7",
-    "@vmz/plugin-shiki": "0.3.7",
-    "@vmz/test": "0.3.7",
+    "@vmz/plugin": "0.3.8",
+    "@vmz/plugin-katex": "0.3.8",
+    "@vmz/plugin-markdown-it": "0.3.8",
+    "@vmz/plugin-shiki": "0.3.8",
+    "@vmz/test": "0.3.8",
     "linkedom": "^0.18.13",
     "typescript": "^5.8.3",
-    "vmz-plugin-conformance": "0.3.7"
+    "vmz-plugin-conformance": "0.3.8"
   },
   "engines": {
     "node": ">=24.12.0"
@@ -80,16 +80,16 @@
   "main": "./dist/index.js",
   "name": "@vmz/vmz",
   "optionalDependencies": {
-    "@vmz/vmz-darwin-arm64": "0.3.7",
-    "@vmz/vmz-darwin-x64": "0.3.7",
-    "@vmz/vmz-linux-arm64": "0.3.7",
-    "@vmz/vmz-linux-x64": "0.3.7",
-    "@vmz/vmz-win32-arm64": "0.3.7",
-    "@vmz/vmz-win32-x64": "0.3.7"
+    "@vmz/vmz-darwin-arm64": "0.3.8",
+    "@vmz/vmz-darwin-x64": "0.3.8",
+    "@vmz/vmz-linux-arm64": "0.3.8",
+    "@vmz/vmz-linux-x64": "0.3.8",
+    "@vmz/vmz-win32-arm64": "0.3.8",
+    "@vmz/vmz-win32-x64": "0.3.8"
   },
   "peerDependencies": {
-    "@vmz/plugin-markdown-it": "0.3.7",
-    "@vmz/test": "0.3.7",
+    "@vmz/plugin-markdown-it": "0.3.8",
+    "@vmz/test": "0.3.8",
     "typescript": "^5.8.3"
   },
   "peerDependenciesMeta": {
@@ -122,5 +122,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "0.3.7"
+  "version": "0.3.8"
 }