@uniweb/build 0.11.5 → 0.11.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.11.5",
+  "version": "0.11.7",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -58,8 +58,8 @@
     "@uniweb/theming": "0.1.3"
   },
   "optionalDependencies": {
-    "@uniweb/runtime": "0.8.7",
-    "@uniweb/content-reader": "1.1.7",
+    "@uniweb/runtime": "0.8.9",
+    "@uniweb/content-reader": "1.1.8",
     "@uniweb/schemas": "0.2.1"
   },
   "peerDependencies": {
@@ -69,7 +69,7 @@
     "@tailwindcss/vite": "^4.0.0",
     "@vitejs/plugin-react": "^4.0.0 || ^5.0.0",
     "vite-plugin-svgr": "^4.0.0",
-    "@uniweb/core": "0.7.6"
+    "@uniweb/core": "0.7.8"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/content/index.js

@@ -31,8 +31,9 @@ export {
   singularize,
 } from '../site/data-fetcher.js'
 
-// Cross-reference registry. Walks the document tree, finds every
-// block-level element with a {#id} attribute, registers the id with
-// its inferred kind + counter. Consumed by the framework's <Ref>
-// component to render `[#id]` cross-references.
-export { buildXrefRegistry } from '../site/xref-registry.js'
+// Cross-reference registry moved out of build into kit
+// (@uniweb/kit/xref). Foundations that need cross-references import
+// `buildXrefRegistry` from there and re-export it via
+// `foundation.xref.build`; the runtime calls it during initialization
+// (setup.js / ssr-renderer.js). See framework/kit/src/xref/registry.js
+// for the implementation.

package/src/prerender.js

@@ -11,7 +11,6 @@ import { readFile, writeFile, mkdir } from 'node:fs/promises'
 import { existsSync, readdirSync, statSync } from 'node:fs'
 import { join, dirname, resolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
-import { deriveCacheKey } from '@uniweb/core'
 import { executeFetch, mergeDataIntoContent, singularize } from './site/data-fetcher.js'
 import { shouldSplitContent } from './site/split-content.js'
 
@@ -420,6 +419,7 @@ export async function prerenderSite(siteDir, options = {}) {
   // Load shared SSR functions from runtime (lazy — only when prerendering)
   const {
     initPrerender,
+    hydrateDataStore,
     prefetchIcons,
     renderPage,
     injectPageContent,
@@ -557,12 +557,10 @@ export async function prerenderSite(siteDir, options = {}) {
     const uniweb = initPrerender(siteContent, foundation, loadedExtensions, { onProgress })
 
     // Build-specific: pre-populate DataStore so EntityStore can resolve data during prerender.
-    // Use the framework's default cache key so runtime probes hit the same entries.
-    if (fetchedData.length > 0 && uniweb.activeWebsite?.dataStore) {
-      for (const entry of fetchedData) {
-        uniweb.activeWebsite.dataStore.set(deriveCacheKey(entry.config), { data: entry.data })
-      }
-    }
+    // hydrateDataStore handles cache-key derivation + value-shape wrapping
+    // — same helper used by the browser SPA boot and by the Cloudflare
+    // Worker SSR isolate, so all three render paths agree on shape.
+    hydrateDataStore(uniweb.activeWebsite, fetchedData)
 
     // Pre-fetch icons for SSR embedding
     await prefetchIcons(siteContent, uniweb, onProgress)

package/src/vite-foundation-plugin.js

@@ -42,13 +42,30 @@ async function buildSchemaWithPreviews(srcDir, outDir, isProduction, sectionPath
 let _buildingSSRBundle = false
 
 /**
- * Build a self-contained ESM bundle for edge SSR (Dynamic Workers).
+ * Build a self-contained ESM bundle for edge SSR (Cloudflare Dynamic Workers).
  *
- * Produces foundation.ssr.js — a single ESM file with React, ReactDOM/server,
- * @uniweb/core, and the foundation components all inlined. No external imports.
+ * Produces `ssr-worker-bundle.js` — a single ESM file with React,
+ * ReactDOM/server, `@uniweb/core`, `@uniweb/runtime/ssr`,
+ * `@uniweb/theming`, and the foundation's components all inlined. No
+ * external imports.
  *
- * This bundle is loaded into a Cloudflare Dynamic Worker isolate at request time
- * via env.LOADER.get(). The isolate caches the bundle per foundation version.
+ * This is **NOT a foundation**. The foundation is `dist/foundation.js`
+ * — a foundation-shaped ESM module that externalizes runtime and links
+ * to it at runtime, the same as in browser SPA / framework SSG / unipress
+ * (Node SSR). This file is something different: a self-contained SSR
+ * pipeline shaped for the Cloudflare Workers Dynamic Worker LOADER, with
+ * the foundation embedded as one of several inputs. The size ratio
+ * (typical ~12× larger than `foundation.js`) reflects what's actually
+ * inside it.
+ *
+ * The artifact is bundled this way because the Dynamic Worker LOADER
+ * accepts a closed `modules` map at isolate construction (no external
+ * resolver, no path back to npm or R2 for transitive imports). One
+ * file in, everything resolves. A future refactor can switch to side-
+ * loading runtime + React + core into the modules map separately so
+ * foundations stop carrying runtime in their bundles — see
+ * `kb/platform/plans/edge-runtime-side-loading.md`. Until then, this
+ * build pre-bundles for the isolate's contract.
  *
  * @param {string} outDir - Path to dist/ directory containing foundation.js
  */
@@ -142,7 +159,7 @@ async function buildSSRBundle(outDir) {
       bundle: true,
       format: 'esm',
       platform: 'browser',
-      outfile: join(outDir, 'foundation.ssr.js'),
+      outfile: join(outDir, 'ssr-worker-bundle.js'),
       minify: false,
       external: [],
       nodePaths,
@@ -151,9 +168,9 @@ async function buildSSRBundle(outDir) {
       logLevel: 'warning',
     })
 
-    const ssrFile = join(outDir, 'foundation.ssr.js')
+    const ssrFile = join(outDir, 'ssr-worker-bundle.js')
     const size = (statSync(ssrFile).size / 1024).toFixed(1)
-    console.log(`Generated foundation.ssr.js (${size} KB)`)
+    console.log(`Generated ssr-worker-bundle.js (${size} KB)`)
   } catch (err) {
     console.warn(`Warning: SSR bundle build failed: ${err.message}`)
   } finally {

package/src/site/xref-registry.js

@@ -1,192 +0,0 @@
-/**
- * Cross-reference registry — populated at content-collection time.
- *
- * Walks the parsed document tree to find every block-level element
- * carrying a {#id} attribute, infers the element's kind from its node
- * type, and records the entry with a per-kind counter. The result
- * attaches to siteContent.xref and is consumed by the framework's
- * <Ref> component to render `[#id]` cross-references.
- *
- * Built-in kinds:
- *   - heading      → 'section'   (hierarchical counter: 1, 1.1, 1.1.1, 2, …)
- *   - image        → 'figure'    (flat arabic counter)
- *   - math_display → 'equation'  (flat arabic counter)
- *   - table        → 'table'     (flat arabic counter)
- *
- * Foundation extensions: foundations may declare additional kinds via
- * `foundation.xref.kinds`. The id-collection pass uses the foundation's
- * declared `prefix` (e.g. `thm` → `theorem`) to classify ids that don't
- * land on a built-in element type.
- *
- * The registry is per-document, not per-page: counters span the whole
- * document so authors get consistent numbering even when their document
- * spans multiple pages. (For page-local counter resets, foundations can
- * declare `resetOn: 'chapter'` on a kind — applied during render, not
- * here.)
- *
- * Output shape:
- *   {
- *     entries: {
- *       <id>: {
- *         id,            // the id itself
- *         kind,          // 'figure' | 'equation' | 'section' | 'table' | <foundation-declared>
- *         counter,       // number for flat kinds, dotted string for hierarchical
- *         counterText,   // displayable counter ('3', '3.2')
- *         sourcePath,    // page route the id was declared on (for back-refs)
- *         caption,       // (figures, tables) caption attr, when set
- *         text,          // (sections) heading's plain text content
- *         latex,         // (equations) latex source for the equation
- *       },
- *     },
- *   }
- *
- * `caption`, `text`, and `latex` are populated only for the elements
- * that carry them — they're undefined on other kinds. List sections
- * (ListOfFigures / ListOfTables / TableOfContents) read these to render
- * "Figure 3 — A diagram of mitosis ........ 47" entries without
- * re-walking the document tree. Other consumers (the framework's <Ref>
- * component, Typst / LaTeX cross-reference emitters) ignore them.
- */
-
-const KIND_BY_TYPE = {
-  heading: 'section',
-  image: 'figure',
-  math_display: 'equation',
-  table: 'table',
-}
-
-export function buildXrefRegistry(siteContent, options = {}) {
-  const { foundationKinds = {}, onWarn = (msg) => console.warn(msg) } = options
-
-  const entries = {}
-  const flatCounters = {}     // kind -> next integer counter (figure, equation, table, foundation-declared kinds)
-  const sectionStack = []     // hierarchical counters per heading level
-
-  // Index foundation prefixes for id-prefix inference.
-  const prefixToKind = {}
-  for (const [kind, meta] of Object.entries(foundationKinds)) {
-    if (meta?.prefix) prefixToKind[meta.prefix] = kind
-  }
-
-  function nextFlat(kind) {
-    flatCounters[kind] = (flatCounters[kind] || 0) + 1
-    return flatCounters[kind]
-  }
-
-  // Track the shallowest heading depth seen — chapter content commonly
-  // starts at h2 (chapter title is rendered separately as h1 by the
-  // foundation), so the first encountered level becomes the document's
-  // top counter level. Re-anchoring: if a later heading appears at a
-  // shallower level than `topLevel`, drop topLevel down to match.
-  let topLevel = null
-
-  function nextHierarchical(level) {
-    if (topLevel == null || level < topLevel) topLevel = level
-    const depth = level - topLevel + 1  // 1-based depth from the document's top level
-
-    // Trim deeper levels when surfacing back to a shallower heading.
-    while (sectionStack.length >= depth) sectionStack.pop()
-    while (sectionStack.length < depth - 1) sectionStack.push(1) // implicit parents start at 1
-    sectionStack.push((sectionStack[depth - 1] || 0) + 1)
-    sectionStack.length = depth
-    return sectionStack.slice().join('.')
-  }
-
-  // Collect the plain text content of a node tree — used to capture a
-  // heading's displayable text for ListOfSections-style entries. Walks
-  // the standard ProseMirror text shape (text nodes carry `.text`;
-  // structural nodes recurse via `.content`).
-  function collectTextContent(node) {
-    if (!node || typeof node !== 'object') return ''
-    if (node.type === 'text' && typeof node.text === 'string') return node.text
-    if (Array.isArray(node.content)) {
-      return node.content.map(collectTextContent).join('')
-    }
-    return ''
-  }
-
-  function inferKind(node) {
-    // 1. Node-type-based: built-ins.
-    const builtin = KIND_BY_TYPE[node.type]
-    if (builtin) return builtin
-    // 2. Explicit kind attribute on the node ({.kind} or kind=…).
-    if (node.attrs?.kind && (KIND_BY_TYPE[node.attrs.kind] || foundationKinds[node.attrs.kind])) {
-      return node.attrs.kind
-    }
-    // 3. Foundation-declared prefix on the id.
-    const id = node.attrs?.id
-    if (id && id.includes('-')) {
-      const prefix = id.slice(0, id.indexOf('-'))
-      if (prefixToKind[prefix]) return prefixToKind[prefix]
-    }
-    return null
-  }
-
-  function visit(node, sourcePath) {
-    if (!node || typeof node !== 'object') return
-
-    // Headings get a hierarchical counter regardless of whether they
-    // carry an id — the {#id} just labels them; the counter itself is
-    // assigned by tree position.
-    let counter = null
-    let counterText = null
-    if (node.type === 'heading') {
-      const level = Math.max(1, Math.min(6, node.attrs?.level || 1))
-      counterText = nextHierarchical(level)
-      counter = counterText
-    }
-
-    const id = node.attrs?.id
-    if (id) {
-      const kind = inferKind(node)
-      if (!kind) {
-        onWarn(`[xref] {#${id}} on unrecognized element type "${node.type}" — ignored`)
-      } else if (entries[id]) {
-        onWarn(`[xref] duplicate id "${id}" — keeping first registration`)
-      } else {
-        if (counter == null) {
-          counter = nextFlat(kind)
-          counterText = String(counter)
-        }
-        const entry = { id, kind, counter, counterText, sourcePath: sourcePath || '' }
-        // Per-kind metadata. List sections (ListOfFigures, ListOfTables,
-        // TableOfContents) read these directly so they don't have to
-        // re-walk the parsed tree to find captions and headings.
-        const captionAttr = node.attrs?.caption
-        if (kind === 'figure' || kind === 'table') {
-          if (captionAttr) entry.caption = String(captionAttr)
-        }
-        if (node.type === 'heading') {
-          const text = collectTextContent(node)
-          if (text) entry.text = text
-        }
-        if (node.type === 'math_display') {
-          const latex = node.attrs?.latex
-          if (latex) entry.latex = String(latex)
-        }
-        entries[id] = entry
-      }
-    } else if (node.type === 'heading') {
-      // Heading without an id still advances the counter — but we don't
-      // register it (no way to reference it). The advance is needed so
-      // that the *next* labeled heading gets the right hierarchical
-      // counter.
-      // counter already computed above; just no entry.
-    }
-
-    if (Array.isArray(node.content)) {
-      for (const child of node.content) visit(child, sourcePath)
-    }
-  }
-
-  for (const page of siteContent.pages || []) {
-    for (const section of page.sections || []) {
-      const content = section.content
-      if (content?.type === 'doc' && Array.isArray(content.content)) {
-        for (const child of content.content) visit(child, page.route)
-      }
-    }
-  }
-
-  return { entries }
-}