@uniweb/build 0.9.3 → 0.9.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -54,7 +54,7 @@
     "@uniweb/theming": "0.1.3"
   },
   "optionalDependencies": {
-    "@uniweb/runtime": "0.7.3",
+    "@uniweb/runtime": "0.7.5",
     "@uniweb/content-reader": "1.1.4",
     "@uniweb/schemas": "0.2.1"
   },
@@ -65,7 +65,7 @@
     "@tailwindcss/vite": "^4.0.0",
     "@vitejs/plugin-react": "^4.0.0 || ^5.0.0",
     "vite-plugin-svgr": "^4.0.0",
-    "@uniweb/core": "0.6.1"
+    "@uniweb/core": "0.6.2"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/prerender.js

@@ -11,6 +11,7 @@ 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'
 
@@ -509,27 +510,19 @@ export async function prerenderSite(siteDir, options = {}) {
     const shellPath = existsSync(htmlPath) ? htmlPath : join(distDir, 'index.html')
     const htmlShell = await readFile(shellPath, 'utf8')
 
-    // Initialize the Uniweb runtime using the shared SSR module
-    const uniweb = initPrerender(siteContent, foundation, { onProgress })
-
-    // Build-specific: pre-populate DataStore so EntityStore can resolve data during prerender
-    if (fetchedData.length > 0 && uniweb.activeWebsite?.dataStore) {
-      for (const entry of fetchedData) {
-        uniweb.activeWebsite.dataStore.set(entry.config, entry.data)
-      }
-    }
-
-    // Build-specific: load extensions (secondary foundations via URL)
-    const extensions = siteContent.config?.extensions
-    if (extensions?.length) {
-      onProgress(`Loading ${extensions.length} extension(s)...`)
+    // Build-specific: load extensions (secondary foundations via URL) BEFORE
+    // initPrerender so the Website's FetcherDispatcher sees their routes.
+    const extensionSources = siteContent.config?.extensions
+    const loadedExtensions = []
+    if (extensionSources?.length) {
+      onProgress(`Loading ${extensionSources.length} extension(s)...`)
       const projectRoot = join(siteDir, '..')
-      for (const ext of extensions) {
+      for (const ext of extensionSources) {
         try {
           const url = typeof ext === 'string' ? ext : ext.url
           const extPath = resolveExtensionPath(url, distDir, projectRoot)
           const extModule = await import(pathToFileURL(extPath).href)
-          uniweb.registerExtension(extModule)
+          loadedExtensions.push(extModule)
           onProgress(`  Extension loaded: ${url}`)
         } catch (err) {
           onProgress(`  Warning: Extension failed to load: ${ext} (${err.message})`)
@@ -537,6 +530,17 @@ export async function prerenderSite(siteDir, options = {}) {
       }
     }
 
+    // Initialize the Uniweb runtime using the shared SSR module
+    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 })
+      }
+    }
+
     // Pre-fetch icons for SSR embedding
     await prefetchIcons(siteContent, uniweb, onProgress)
 

package/src/runtime-schema.js

@@ -10,7 +10,18 @@
  * - defaults: param default values
  * - context: static capabilities for cross-block coordination
  * - initialState: initial values for mutable block state
- * - inheritData: boolean or array for cascaded data from page/site fetches
+ * - inheritData: internal flag for cascaded data delivery
+ *     true  → deliver all data available at ancestor levels (default)
+ *     false → deliver nothing (component opted out with `data: false`)
+ *
+ * Data delivery is default-on: a component without any `data:` field
+ * receives all data cascaded from its ancestor levels (block → page →
+ * parent page → site) via `content.data.{schema}`. A component that
+ * genuinely cannot tolerate ambient data declares `data: false`.
+ *
+ * `data: { entity: 'articles' }` is a **declaration**, not a gate. It
+ * tells the editor and prepare-props what shape the component expects,
+ * but does not restrict delivery.
  *
  * Full metadata (titles, descriptions, hints, etc.) stays in schema.json
  * for the visual editor.
@@ -202,39 +213,64 @@ export function extractRuntimeSchema(fullMeta) {
   }
 
   // Data binding (CMS entities)
-  // Supports both old format (data: 'person:6') and new consolidated format
-  // (data: { entity: 'person:6', schemas: {...}, inherit: [...] })
-  if (fullMeta.data) {
-    if (typeof fullMeta.data === 'string') {
-      // Old format: data: 'person:6'
-      const parsed = parseDataString(fullMeta.data)
+  //
+  // Supported forms:
+  //   data: false                            → explicit opt-out
+  //   data: { entity: 'person:6' }           → declaration + shape hints
+  //   data: { schemas: {...} }               → validation / default shapes
+  //   data: 'person:6'                       → legacy string form (declaration only)
+  //
+  // Deprecated forms (accepted with dev-mode warning, removed in next release):
+  //   data: { inherit: true | false | [...] }  — component-side gating is gone;
+  //                                              delivery is default-on
+  //   data: { detail, limit }                   — moved to block-level fetch
+  if (fullMeta.data === false) {
+    // Explicit opt-out — deliver nothing to this component.
+    runtime.inheritData = false
+  } else if (typeof fullMeta.data === 'string') {
+    // Legacy string form: data: 'person:6'
+    const parsed = parseDataString(fullMeta.data)
+    if (parsed) {
+      runtime.data = parsed
+    }
+  } else if (fullMeta.data && typeof fullMeta.data === 'object') {
+    if (fullMeta.data.entity) {
+      const parsed = parseDataString(fullMeta.data.entity)
       if (parsed) {
         runtime.data = parsed
       }
-    } else if (typeof fullMeta.data === 'object') {
-      // New format: data: { entity, schemas, inherit }
-      if (fullMeta.data.entity) {
-        const parsed = parseDataString(fullMeta.data.entity)
-        if (parsed) {
-          runtime.data = parsed
-        }
-      }
-      if (fullMeta.data.schemas) {
-        const schemas = extractSchemas(fullMeta.data.schemas)
-        if (schemas) {
-          runtime.schemas = schemas
-        }
+    }
+    if (fullMeta.data.schemas) {
+      const schemas = extractSchemas(fullMeta.data.schemas)
+      if (schemas) {
+        runtime.schemas = schemas
       }
-      if (fullMeta.data.inherit !== undefined) {
-        runtime.inheritData = fullMeta.data.inherit
+    }
+    // Deprecated: data.inherit is a no-op under default-on delivery. The
+    // only behavior we still honor is `inherit: false` → treat as opt-out,
+    // so existing foundations that wrote "don't deliver" still don't.
+    // Array and `true` forms are ignored — delivery happens regardless.
+    if (fullMeta.data.inherit === false) {
+      if (typeof process !== 'undefined' && process.env?.NODE_ENV !== 'production') {
+        console.warn(
+          '[uniweb] `data: { inherit: false }` is deprecated; use `data: false` instead.'
+        )
       }
-      // detail: false → opt out of single-item resolution on dynamic pages,
-      // returning the collection instead (minus the active item)
-      if (fullMeta.data.detail !== undefined) {
-        runtime.inheritDetail = fullMeta.data.detail
+      runtime.inheritData = false
+    } else if (fullMeta.data.inherit !== undefined) {
+      if (typeof process !== 'undefined' && process.env?.NODE_ENV !== 'production') {
+        console.warn(
+          '[uniweb] `data: { inherit: ... }` is deprecated; delivery is default-on. Remove the `inherit` field.'
+        )
       }
-      if (fullMeta.data.limit !== undefined) {
-        runtime.inheritLimit = fullMeta.data.limit
+    }
+    // Deprecated: detail/limit on the component side. Block-level
+    // `fetch: { inherit: true, detail, limit }` is where these belong now.
+    if (fullMeta.data.detail !== undefined || fullMeta.data.limit !== undefined) {
+      if (typeof process !== 'undefined' && process.env?.NODE_ENV !== 'production') {
+        console.warn(
+          '[uniweb] `data: { detail, limit }` on the component side is deprecated; set these on a block-level `fetch: { inherit: true, ... }` instead.'
+        )
       }
     }
   }
@@ -267,18 +303,17 @@ export function extractRuntimeSchema(fullMeta) {
     }
   }
 
-  // Data inheritance - component receives cascaded data from page/site level fetches
-  // Can be: true (inherit all), false (inherit none), or ['schema1', 'schema2'] (selective)
-  // Top-level inheritData supported for backwards compat (lower priority than data.inherit)
-  if (fullMeta.inheritData !== undefined && runtime.inheritData === undefined) {
-    runtime.inheritData = fullMeta.inheritData
+  // Top-level inheritData (legacy, pre-`data.*` format) — honored only as opt-out.
+  // Truthy values and arrays are ignored; delivery is default-on.
+  if (fullMeta.inheritData === false && runtime.inheritData === undefined) {
+    runtime.inheritData = false
   }
 
-  // Auto-derive inheritData from entity type when no explicit inherit is set.
-  // data: { entity: 'articles' } implies inheritData: ['articles']
-  if (runtime.data && runtime.inheritData === undefined) {
-    runtime.inheritData = [runtime.data.type]
-  }
+  // Data delivery is default-on. `runtime.inheritData` stays undefined unless
+  // the component explicitly opts out (runtime.inheritData === false), in
+  // which case EntityStore delivers nothing. The declaration `data.entity`
+  // no longer implies a gate — it's a hint consumed by prepare-props and
+  // the editor.
 
   return Object.keys(runtime).length > 0 ? runtime : null
 }

package/src/site/data-fetcher.js

@@ -225,11 +225,25 @@ export function parseFetchConfig(fetch) {
   // Full config object
   if (typeof fetch !== 'object') return null
 
-  // Inherit-merge config: { inherit: true, detail: false, limit: 3 }
-  // No URL — merges with the parent fetch config at runtime; only carries override props.
-  if (fetch.inherit === true) {
+  // Refine config: { refine: true, detail: false, limit: 3 }
+  // No URL — merges with the parent fetch config at runtime; only carries
+  // override props. The legacy spelling `inherit: true` is accepted for one
+  // release with a warning, then removed.
+  //
+  // Note on build-vs-runtime scope: this parser passes `sort` and `filter`
+  // through on refine configs, but the runtime EntityStore only applies
+  // `detail`, `limit`, and `order` overrides. `sort` / `filter` on a refine
+  // block are currently accepted by the parser but not honored at runtime.
+  // Preserved as-is in this rename commit; revisit separately if needed.
+  if (fetch.refine === true || fetch.inherit === true) {
+    if (fetch.inherit === true && fetch.refine !== true) {
+      console.warn(
+        "[uniweb] 'fetch: { inherit: true }' is deprecated; rename to 'fetch: { refine: true }'. " +
+        'Accepted for one release; will be removed in the next minor.'
+      )
+    }
     return {
-      inherit: true,
+      refine: true,
       ...(fetch.detail !== undefined ? { detail: fetch.detail } : {}),
       ...(fetch.limit !== undefined ? { limit: fetch.limit } : {}),
       ...(fetch.sort !== undefined ? { sort: fetch.sort } : {}),