@uniweb/build 0.1.21 → 0.1.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -59,7 +59,7 @@
     "@tailwindcss/vite": "^4.0.0",
     "@vitejs/plugin-react": "^4.0.0 || ^5.0.0",
     "vite-plugin-svgr": "^4.0.0",
-    "@uniweb/core": "0.1.9"
+    "@uniweb/core": "0.1.10"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/docs.js

@@ -7,7 +7,7 @@
 
 import { readFile, writeFile } from 'node:fs/promises'
 import { existsSync } from 'node:fs'
-import { join } from 'node:path'
+import { join, isAbsolute } from 'node:path'
 import { buildSchema } from './schema.js'
 
 /**
@@ -30,51 +30,39 @@ function generateComponentDocs(name, meta) {
     lines.push('')
   }
 
-  // Category badge
-  if (meta.category) {
-    lines.push(`**Category:** ${meta.category}`)
-    lines.push('')
-  }
-
-  // Content Elements
-  if (meta.elements && Object.keys(meta.elements).length > 0) {
-    lines.push('### Content Elements')
-    lines.push('')
-    lines.push('| Element | Label | Required | Description |')
-    lines.push('|---------|-------|----------|-------------|')
-
-    for (const [key, element] of Object.entries(meta.elements)) {
-      const label = element.label || key
-      const required = element.required ? 'Yes' : ''
-      const description = element.description || ''
-      lines.push(`| \`${key}\` | ${label} | ${required} | ${description} |`)
-    }
-    lines.push('')
-  }
-
-  // Parameters/Properties
+  // Parameters/Properties (shown first - most important for content authors)
   if (meta.properties && Object.keys(meta.properties).length > 0) {
     lines.push('### Parameters')
     lines.push('')
-    lines.push('| Parameter | Type | Default | Description |')
-    lines.push('|-----------|------|---------|-------------|')
 
     for (const [key, prop] of Object.entries(meta.properties)) {
-      const type = prop.type || 'string'
-      const defaultVal = prop.default !== undefined ? `\`${prop.default}\`` : ''
-      let description = prop.label || ''
+      const defaultVal = prop.default !== undefined ? prop.default : ''
+
+      // Parameter name with default
+      if (defaultVal !== '') {
+        lines.push(`**${key}** = \`${defaultVal}\``)
+      } else {
+        lines.push(`**${key}**`)
+      }
 
-      // Add options for select type
+      // For select type, show options on next line
       if (prop.type === 'select' && prop.options) {
         const optionValues = prop.options.map(o =>
           typeof o === 'object' ? o.value : o
-        ).join(', ')
-        description += description ? ` (${optionValues})` : optionValues
+        ).join(' | ')
+        lines.push(`  ${optionValues}`)
+      } else if (prop.type === 'boolean') {
+        // For boolean, show the label as description
+        if (prop.label) {
+          lines.push(`  ${prop.label}`)
+        }
+      } else if (prop.label) {
+        // For other types, show label
+        lines.push(`  ${prop.label}`)
       }
 
-      lines.push(`| \`${key}\` | ${type} | ${defaultVal} | ${description} |`)
+      lines.push('')
     }
-    lines.push('')
   }
 
   // Presets
@@ -88,11 +76,24 @@ function generateComponentDocs(name, meta) {
             .map(([k, v]) => `${k}: ${v}`)
             .join(', ')
         : ''
-      lines.push(`- **${preset.name}** - ${preset.label || ''} ${settings ? `(${settings})` : ''}`)
+      lines.push(`- **${preset.name}**${settings ? ` — ${settings}` : ''}`)
     }
     lines.push('')
   }
 
+  // Content Elements (condensed - less important)
+  if (meta.elements && Object.keys(meta.elements).length > 0) {
+    const elements = Object.entries(meta.elements)
+    const elementList = elements.map(([key, el]) => {
+      return el.required ? `${key} (required)` : key
+    }).join(', ')
+
+    lines.push('### Content')
+    lines.push('')
+    lines.push(elementList)
+    lines.push('')
+  }
+
   return lines.join('\n')
 }
 
@@ -112,17 +113,11 @@ export function generateDocsFromSchema(schema, options = {}) {
   lines.push(`# ${title}`)
   lines.push('')
 
-  // Foundation info
+  // Foundation description
   const foundationMeta = schema._self
-  if (foundationMeta) {
-    if (foundationMeta.name) {
-      lines.push(`**${foundationMeta.name}**`)
-      lines.push('')
-    }
-    if (foundationMeta.description) {
-      lines.push(foundationMeta.description)
-      lines.push('')
-    }
+  if (foundationMeta?.description) {
+    lines.push(foundationMeta.description)
+    lines.push('')
   }
 
   lines.push('---')
@@ -134,11 +129,7 @@ export function generateDocsFromSchema(schema, options = {}) {
   if (componentNames.length > 0) {
     lines.push('## Components')
     lines.push('')
-    for (const name of componentNames) {
-      const meta = schema[name]
-      const title = meta.title || name
-      lines.push(`- [${title}](#${name.toLowerCase()}) - ${meta.description || ''}`)
-    }
+    lines.push(componentNames.map(name => `[${name}](#${name.toLowerCase()})`).join(' · '))
     lines.push('')
     lines.push('---')
     lines.push('')
@@ -152,10 +143,7 @@ export function generateDocsFromSchema(schema, options = {}) {
     lines.push('')
   }
 
-  // Footer
-  lines.push('*Generated from foundation schema*')
-
-  return lines.join('\n')
+  return lines.join('\n').trim() + '\n'
 }
 
 /**
@@ -206,8 +194,8 @@ export async function generateDocs(foundationDir, options = {}) {
   // Generate markdown
   const markdown = generateDocsFromSchema(schema, { title })
 
-  // Write output
-  const outputPath = join(foundationDir, output)
+  // Write output (support absolute paths for site-based generation)
+  const outputPath = isAbsolute(output) ? output : join(foundationDir, output)
   await writeFile(outputPath, markdown)
 
   // Count components

package/src/prerender.js

@@ -118,11 +118,21 @@ export async function prerenderSite(siteDir, options = {}) {
   const pages = uniweb.activeWebsite.pages
 
   for (const page of pages) {
-    const route = page.route
-    onProgress(`Rendering ${route}...`)
+    // Determine which routes to render this page at
+    // Index pages are rendered at both their actual route and their nav route
+    const routesToRender = [page.route]
+    if (page.isIndex) {
+      const navRoute = page.getNavRoute()
+      if (navRoute !== page.route) {
+        routesToRender.push(navRoute)
+      }
+    }
+
+    // Render once, output to multiple paths
+    onProgress(`Rendering ${routesToRender[0]}...`)
 
     // Set this as the active page
-    uniweb.activeWebsite.setActivePage(route)
+    uniweb.activeWebsite.setActivePage(page.route)
 
     // Create the page element
     // Note: We don't need StaticRouter for SSG since we're just rendering
@@ -134,7 +144,7 @@ export async function prerenderSite(siteDir, options = {}) {
     try {
       renderedContent = renderToString(element)
     } catch (err) {
-      console.warn(`Warning: Failed to render ${route}: ${err.message}`)
+      console.warn(`Warning: Failed to render ${page.route}: ${err.message}`)
       if (process.env.DEBUG) {
         console.error(err.stack)
       }
@@ -144,13 +154,15 @@ export async function prerenderSite(siteDir, options = {}) {
     // Inject into shell
     const html = injectContent(htmlShell, renderedContent, page, siteContent)
 
-    // Determine output path
-    const outputPath = getOutputPath(distDir, route)
-    await mkdir(dirname(outputPath), { recursive: true })
-    await writeFile(outputPath, html)
+    // Output to all routes for this page
+    for (const route of routesToRender) {
+      const outputPath = getOutputPath(distDir, route)
+      await mkdir(dirname(outputPath), { recursive: true })
+      await writeFile(outputPath, html)
 
-    renderedFiles.push(outputPath)
-    onProgress(`  → ${outputPath.replace(distDir, 'dist')}`)
+      renderedFiles.push(outputPath)
+      onProgress(`  → ${outputPath.replace(distDir, 'dist')}`)
+    }
   }
 
   onProgress(`Pre-rendered ${renderedFiles.length} pages`)

package/src/site/content-collector.js

@@ -351,11 +351,10 @@ async function processPage(pagePath, pageName, siteRoot, { isIndex = false, pare
   }
 
   // Determine route
+  // All pages get their actual folder-based route (no special treatment for index)
+  // The isIndex flag marks which page should also be accessible at the parent route
   let route
-  if (isIndex) {
-    // Index page gets the parent route
-    route = parentRoute
-  } else if (pageName.startsWith('@')) {
+  if (pageName.startsWith('@')) {
     // Special pages (layout areas) keep their @ prefix
     route = parentRoute === '/' ? `/@${pageName.slice(1)}` : `${parentRoute}/@${pageName.slice(1)}`
   } else {
@@ -369,6 +368,7 @@ async function processPage(pagePath, pageName, siteRoot, { isIndex = false, pare
   return {
     page: {
       route,
+      isIndex, // Marks this page as the index for its parent route (accessible at parentRoute)
       title: pageConfig.title || pageName,
       description: pageConfig.description || '',
       label: pageConfig.label || null, // Short label for navigation (defaults to title)

package/src/site/plugin.js

@@ -295,7 +295,9 @@ export function siteContentPlugin(options = {}) {
 
       // Watch for content changes in dev mode
       if (shouldWatch) {
-        const watchPath = resolve(resolvedSitePath, pagesDir)
+        const pagesPath = resolve(resolvedSitePath, pagesDir)
+        const siteYmlPath = resolve(resolvedSitePath, 'site.yml')
+        const themeYmlPath = resolve(resolvedSitePath, 'theme.yml')
 
         // Debounce rebuilds
         let rebuildTimeout = null
@@ -315,12 +317,33 @@ export function siteContentPlugin(options = {}) {
           }, 100)
         }
 
+        // Track all watchers for cleanup
+        const watchers = []
+
+        // Watch pages directory
         try {
-          watcher = watch(watchPath, { recursive: true }, scheduleRebuild)
-          console.log(`[site-content] Watching ${watchPath}`)
+          watchers.push(watch(pagesPath, { recursive: true }, scheduleRebuild))
+          console.log(`[site-content] Watching ${pagesPath}`)
         } catch (err) {
           console.warn('[site-content] Could not watch pages directory:', err.message)
         }
+
+        // Watch site.yml
+        try {
+          watchers.push(watch(siteYmlPath, scheduleRebuild))
+        } catch (err) {
+          // site.yml may not exist, that's ok
+        }
+
+        // Watch theme.yml
+        try {
+          watchers.push(watch(themeYmlPath, scheduleRebuild))
+        } catch (err) {
+          // theme.yml may not exist, that's ok
+        }
+
+        // Store watchers for cleanup
+        watcher = { close: () => watchers.forEach(w => w.close()) }
       }
 
       // Serve content and SEO files