@uniweb/build 1.6.0 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -59,12 +59,12 @@
     "@uniweb/semantic-parser": "~1.12.2",
     "@uniweb/content-reader": "~1.5.4",
     "@uniweb/theming": "~1.2.0",
+    "@uniweb/schemas": "~1.5.2",
     "@uniweb/content-writer": "~1.3.0",
-    "@uniweb/projections": "~1.1.4",
-    "@uniweb/schemas": "~1.5.0"
+    "@uniweb/projections": "~1.1.5"
   },
   "optionalDependencies": {
-    "@uniweb/runtime": "~1.1.11"
+    "@uniweb/runtime": "~1.1.12"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
@@ -73,8 +73,8 @@
     "@tailwindcss/vite": "^4.0.0",
     "@vitejs/plugin-react": "^4.0.0 || ^5.0.0",
     "vite-plugin-svgr": "^4.0.0",
-    "@uniweb/core": "~1.3.1",
-    "@uniweb/runtime": "~1.1.11"
+    "@uniweb/core": "~1.3.2",
+    "@uniweb/runtime": "~1.1.12"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/foundation/derive-supports.js

@@ -34,6 +34,17 @@
  * which is exactly the invisible failure this whole mechanism exists to stop.
  * Never widen the scan set to "everything Rollup saw".
  *
+ * ⛔ **And within a survivor, read only the code it kept.** A module survives
+ * when ONE of its exports is used, and Rollup drops the rest of it — so walking
+ * the module's ORIGINAL source counts every function in it. Measured 2026-10-19
+ * on `@std/academic`, whose code reaches only `isSearchEnabled()`: kit's
+ * `servicePredicates.js` survived for that one predicate, its source holds all
+ * five, and the foundation published `assistant, backend, search, submit` — a
+ * bundle with one `isServiceEnabled('search')` and none of the other three. ⇒
+ * Each survivor's RENDERED code (`chunk.modules[id].code`) is what is parsed and
+ * walked. A survivor whose rendered code cannot be read is blindness, never a
+ * fall back to its source.
+ *
  * ## ⭐ The service name travels with the code, so there is almost no map
  *
  * `kit/src/utils/submitTarget.js` contains `resolveService(website, 'submit')`
@@ -172,11 +183,17 @@ function readModuleConsts(ast) {
   return consts
 }
 
-/** `resolveService(...)`, called bare or through a namespace. */
+/**
+ * `resolveService(...)`, called bare or through a namespace.
+ *
+ * The bare form is read from RENDERED code, where Rollup may have renamed an
+ * imported binding to keep it apart from another of the same name in the chunk
+ * (`resolveService$1`) — so the suffix it adds is accepted.
+ */
 function isResolveServiceCall(node) {
   if (node.type !== 'CallExpression') return false
   const callee = node.callee
-  if (callee?.type === 'Identifier') return callee.name === 'resolveService'
+  if (callee?.type === 'Identifier') return /^resolveService(\$\d+)?$/.test(callee.name)
   if (callee?.type === 'MemberExpression' && !callee.computed) {
     return callee.property?.name === 'resolveService'
   }
@@ -218,23 +235,38 @@ function isSearchEnabledCall(node) {
 }
 
 /**
- * The set of modules that contributed code to the written bundle.
+ * The modules that contributed code to the written bundle, each with the code
+ * it contributed.
  *
  * `renderedLength > 0` is the discriminator: a module whose every binding was
  * shaken out contributes nothing, and counting it would reintroduce exactly the
- * over-reporting this module exists to avoid.
+ * over-reporting this module exists to avoid. ⛔ And what a survivor contributed
+ * is its RENDERED code (`code`), not its source: a module kept for one export
+ * keeps only that export (header, *Post-tree-shake only*).
+ *
+ * @returns {Map<string, string|null>} module id → its rendered code
  */
 function collectSurvivors(bundle) {
-  const survivors = new Set()
+  const survivors = new Map()
   for (const chunk of Object.values(bundle || {})) {
     if (chunk?.type !== 'chunk' || !chunk.modules) continue
     for (const [id, mod] of Object.entries(chunk.modules)) {
-      if (mod?.renderedLength > 0) survivors.add(id)
+      if (mod?.renderedLength > 0) survivors.set(id, typeof mod.code === 'string' ? mod.code : null)
     }
   }
   return survivors
 }
 
+/** A survivor's rendered code as an ESTree tree, or null when it cannot be read. */
+function renderedAst(code, ctx) {
+  if (typeof code !== 'string' || typeof ctx?.parse !== 'function') return null
+  try {
+    return ctx.parse(code)
+  } catch {
+    return null
+  }
+}
+
 /**
  * Derive the services this foundation reaches for.
  *
@@ -245,22 +277,26 @@ function collectSurvivors(bundle) {
  * `isSearchEnabled()`. Names in `NEVER_EMITTED` are dropped from the result.
  *
  * @param {object} bundle - Rollup's bundle, as handed to `writeBundle`
- * @param {object} ctx - the Rollup plugin context (`this` in the hook)
+ * @param {object} ctx - the Rollup plugin context (`this` in the hook): its
+ *   `parse` reads each survivor's rendered code
  * @returns {{services: string[], blind: boolean, blindAt: string[]}}
  *   `services` is sorted and de-duplicated, and is a **lower bound**.
  *   `blind` is true when a `resolveService` call names its service with
- *   something this cannot read — the one case where the lower bound is known to
- *   be incomplete, and the caller must not report an empty result as a proven
- *   "none". `blindAt` names the modules, for the warning.
+ *   something this cannot read, or a survivor's rendered code cannot be read at
+ *   all — the cases where the lower bound is known to be incomplete, and the
+ *   caller must not report an empty result as a proven "none". `blindAt` names
+ *   the modules, for the warning.
  */
 export function deriveSupports(bundle, ctx) {
   const services = new Set()
   const blindAt = new Set()
 
-  for (const id of collectSurvivors(bundle)) {
-    const info = ctx?.getModuleInfo?.(id)
-    const ast = info?.ast
-    if (!ast) continue
+  for (const [id, code] of collectSurvivors(bundle)) {
+    const ast = renderedAst(code, ctx)
+    if (!ast) {
+      blindAt.add(id)
+      continue
+    }
 
     const consts = readModuleConsts(ast)
 

package/src/site/content-collector.js

@@ -39,6 +39,7 @@ import { resolveExtensionUrls } from './extension-urls.js'
 import { buildTheme, extractFoundationVars } from '../theme/index.js'
 import { resolveDefaultLocale, resolvePublishableLocales, validateLanguageConfig, pageRouteQuery, currentFor } from '@uniweb/core'
 import { authoredRedirectTarget } from '@uniweb/core/resolve-route'
+import { parentRouteOf } from '@uniweb/core/route-match'
 import { parseFrontmatter } from '../utils/frontmatter.js'
 import { parseGrid } from '@uniweb/schemas/grid'
 import { runtimeServicesConfig, refuseRetiredServiceKeys, refuseUnreadableServices } from '../uwx/services-request.js'
@@ -2719,8 +2720,10 @@ export async function collectSiteContent(sitePath, options = {}) {
     }
   }
 
-  // Compute parent route for each page (hierarchy declaration)
-  // This runs once at build time so runtime doesn't need to re-derive hierarchy
+  // Compute parent route for each page (hierarchy declaration), by the one parent rule
+  // (`parentRouteOf`) — so the parent declared here is the one every lane derives, past a
+  // version folder included. This runs once at build time so runtime doesn't need to
+  // re-derive hierarchy.
   const pageRouteMap = new Map()
   for (const page of pages) {
     pageRouteMap.set(page.route, page)
@@ -2728,15 +2731,10 @@ export async function collectSiteContent(sitePath, options = {}) {
       pageRouteMap.set(page.sourcePath, page)
     }
   }
+  const hasPage = (route) => pageRouteMap.has(route)
   for (const page of pages) {
-    const segments = page.route.split('/').filter(Boolean)
-    if (segments.length <= 1) {
-      page.parent = null
-      continue
-    }
-    const parentRoute = '/' + segments.slice(0, -1).join('/')
-    const parentPage = pageRouteMap.get(parentRoute)
-    page.parent = parentPage ? parentPage.route : null
+    const parentRoute = parentRouteOf(page.route, { has: hasPage })
+    page.parent = parentRoute ? pageRouteMap.get(parentRoute).route : null
   }
 
   const siteFetch = parseFetchConfig(...fetchIn(siteConfig, 'site.yml', 'site'))