@uniweb/core 0.5.9 → 0.5.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/core",
-  "version": "0.5.9",
+  "version": "0.5.11",
   "description": "Core classes for the Uniweb platform - Uniweb, Website, Page, Block",
   "type": "module",
   "exports": {
@@ -30,7 +30,8 @@
     "jest": "^29.7.0"
   },
   "dependencies": {
-    "@uniweb/semantic-parser": "1.1.6"
+    "@uniweb/semantic-parser": "1.1.6",
+    "@uniweb/theming": "0.1.1"
   },
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"

package/src/block.js

@@ -6,21 +6,7 @@
  */
 
 import { parseContent as parseSemanticContent } from '@uniweb/semantic-parser'
-
-/**
- * Resolve bare palette references to var() in theme overrides.
- * Allows content authors to write `primary: neutral-900` in frontmatter
- * instead of `primary: var(--neutral-900)`.
- */
-const SHADE_LEVELS = new Set([50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 950])
-
-function resolveOverrideValue(value) {
-  if (typeof value !== 'string' || value.includes('(') || value.startsWith('#')) return value
-  const bare = value.replace(/^-{0,2}/, '')
-  const match = bare.match(/^([a-z][a-z0-9]*)-(\d+)$/)
-  if (match && SHADE_LEVELS.has(parseInt(match[2], 10))) return `var(--${bare})`
-  return value
-}
+import { normalizeTokenValue } from '@uniweb/theming'
 
 export default class Block {
   constructor(blockData, id, page) {
@@ -58,20 +44,26 @@ export default class Block {
 
     // Normalize theme: supports string ("light") or object ({ mode, ...tokenOverrides })
     // Resolve bare palette refs (e.g. "primary: neutral-900" → var(--neutral-900))
+    //
+    // themeName values:
+    //   '' (empty) = Auto — section inherits from site's appearance/scheme
+    //   'light'    = Pinned to light context
+    //   'medium'   = Pinned to dim context
+    //   'dark'     = Pinned to dark context
     const rawTheme = blockConfig.theme
     if (rawTheme && typeof rawTheme === 'object') {
       const { mode, ...overrides } = rawTheme
-      this.themeName = mode || 'light'
+      this.themeName = mode || ''
       if (Object.keys(overrides).length > 0) {
         for (const key of Object.keys(overrides)) {
-          overrides[key] = resolveOverrideValue(overrides[key])
+          overrides[key] = normalizeTokenValue(overrides[key])
         }
         this.contextOverrides = overrides
       } else {
         this.contextOverrides = null
       }
     } else {
-      this.themeName = rawTheme || 'light'
+      this.themeName = rawTheme ?? ''
       this.contextOverrides = null
     }
 
@@ -149,6 +141,10 @@ export default class Block {
     // Context (static, defined per component type)
     this.context = null
 
+    // Component-level CSS variables (merged meta.js defaults + frontmatter overrides)
+    // Populated by initComponent() — context-independent, emitted on #section-{id}
+    this.componentVars = null
+
     Object.seal(this)
   }
 
@@ -176,6 +172,11 @@ export default class Block {
       return this.extractFromProseMirror(content)
     }
 
+    // Wrapped ProseMirror document (Content API format: { doc: { type: "doc", ... } })
+    if (content?.doc?.type === 'doc') {
+      return this.extractFromProseMirror(content.doc)
+    }
+
     // Plain object content — pass through directly.
     // guaranteeContentStructure() in prepare-props will fill in missing fields.
     if (content && typeof content === 'object' && !Array.isArray(content)) {
@@ -284,6 +285,12 @@ export default class Block {
     // Source: meta.js context field
     this.context = meta.context ? { ...meta.context } : null
 
+    // Merge component-level CSS vars: meta.js defaults + frontmatter overrides
+    // Source: meta.js vars field (defaults), section frontmatter vars: key (overrides)
+    if (meta.vars) {
+      this.componentVars = Block.mergeComponentVars(meta.vars, this.properties.vars)
+    }
+
     return this.Component
   }
 
@@ -434,6 +441,38 @@ export default class Block {
     return this.dynamicContext
   }
 
+  /**
+   * Merge component-level CSS variable defaults with frontmatter overrides.
+   *
+   * Schema vars (from meta.js) can be:
+   * - String shorthand: 'card-gap': '1.5rem' → { default: '1.5rem' }
+   * - Object: 'card-gap': { default: '1.5rem', label: 'Card Gap' }
+   *
+   * @param {Object} schemaVars - Var definitions from meta.js
+   * @param {Object} [frontmatterVars] - Overrides from section frontmatter
+   * @returns {Object} Flat { name: value } object for CSS emission
+   */
+  static mergeComponentVars(schemaVars, frontmatterVars = {}) {
+    const merged = {}
+
+    for (const [name, config] of Object.entries(schemaVars)) {
+      const defaultVal = typeof config === 'string' ? config : config?.default
+      if (defaultVal != null) {
+        merged[name] = defaultVal
+      }
+    }
+
+    if (frontmatterVars && typeof frontmatterVars === 'object') {
+      for (const [name, value] of Object.entries(frontmatterVars)) {
+        if (value != null && name in schemaVars) {
+          merged[name] = String(value)
+        }
+      }
+    }
+
+    return Object.keys(merged).length > 0 ? merged : null
+  }
+
   /**
    * Normalize a background value from section frontmatter
    *
@@ -464,7 +503,7 @@ export default class Block {
 
       // Anything else → CSS color (hex, rgb, hsl, oklch, named color, var())
       // Resolve bare palette refs (e.g. "primary-900" → "var(--primary-900)")
-      return { mode: 'color', color: resolveOverrideValue(raw) }
+      return { mode: 'color', color: normalizeTokenValue(raw) }
     }
 
     // Object with explicit mode — pass through

package/src/website.js

@@ -74,7 +74,7 @@ export default class Website {
 
     // Legacy language support (for editor multilingual)
     this.activeLang = this.activeLocale
-    this.langs = config.languages || this.locales.map(l => ({
+    this.langs = this.locales.map(l => ({
       label: l.label || l.code,
       value: l.code
     }))
@@ -107,7 +107,7 @@ export default class Website {
    */
   buildLocalesList(config) {
     const defaultLocale = config.defaultLanguage || 'en'
-    const i18nLocales = config.i18n?.locales || []
+    const languages = config.languages || []
 
     // Normalize input: convert strings to objects, keep objects as-is
     const normalizeLocale = (locale) => {
@@ -118,14 +118,14 @@ export default class Website {
       return { code: locale.code, ...(locale.label && { label: locale.label }) }
     }
 
-    // Start with default locale (may not be in i18nLocales)
+    // Start with default locale (may not be in languages list)
     const localeMap = new Map()
     localeMap.set(defaultLocale, { code: defaultLocale })
 
-    // Add i18n locales (may include objects with labels)
-    for (const locale of i18nLocales) {
+    // Add configured languages (may include objects with labels)
+    for (const locale of languages) {
       const normalized = normalizeLocale(locale)
-      // Merge with existing (to preserve labels if default locale also in i18n with label)
+      // Merge with existing (to preserve labels if default locale also in languages with label)
       if (localeMap.has(normalized.code)) {
         const existing = localeMap.get(normalized.code)
         localeMap.set(normalized.code, { ...existing, ...normalized })
@@ -577,12 +577,19 @@ export default class Website {
    * makeHref('/about')                         // → '/about' (passthrough)
    */
   makeHref(href) {
-    if (!href || !href.startsWith('page:')) {
+    if (!href) return href
+
+    // Support both page: (current) and topic: (legacy) prefixes
+    let withoutPrefix
+    if (href.startsWith('page:')) {
+      withoutPrefix = href.slice(5)
+    } else if (href.startsWith('topic:')) {
+      withoutPrefix = href.slice(6)
+    } else {
       return href
     }
 
     // Parse page reference: page:pageId#sectionId
-    const withoutPrefix = href.slice(5) // Remove 'page:'
     const [pageId, sectionId] = withoutPrefix.split('#')
 
     // Look up page by ID (explicit or route-based)
@@ -878,6 +885,10 @@ export default class Website {
         if (navType === 'footer' && page.hideInFooter) return false
       }
 
+      // Skip empty folders (no content) that have no visible children.
+      // Folders with children still appear as dropdown parents.
+      if (!page.hasContent() && !page.children?.some(isPageVisible)) return false
+
       // Apply custom filter if provided
       if (customFilter && !customFilter(page)) return false