@uniweb/build 0.1.30 → 0.1.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.1.30",
+  "version": "0.1.32",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -51,7 +51,7 @@
   },
   "optionalDependencies": {
     "@uniweb/content-reader": "1.0.4",
-    "@uniweb/runtime": "0.2.17"
+    "@uniweb/runtime": "0.2.18"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
@@ -60,7 +60,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.13"
+    "@uniweb/core": "0.1.15"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/site/collection-processor.js

@@ -5,7 +5,7 @@
  * Collections are defined in site.yml and processed at build time.
  *
  * Features:
- * - Discovers markdown files in content folders
+ * - Discovers markdown files in collection folders
  * - Parses frontmatter for metadata
  * - Converts markdown body to ProseMirror JSON
  * - Supports filtering, sorting, and limiting
@@ -17,7 +17,7 @@
  * // site.yml
  * collections:
  *   articles:
- *     path: content/articles
+ *     path: library/articles
  *     sort: date desc
  *
  * // Usage
@@ -58,11 +58,12 @@ try {
  *
  * @example
  * // Simple form
- * parseCollectionConfig('articles', 'content/articles')
+ * parseCollectionConfig('articles', 'library/articles')
  *
  * // Extended form
  * parseCollectionConfig('articles', {
- *   path: 'content/articles',
+ *   path: 'library/articles',
+ *   route: '/blog',
  *   sort: 'date desc',
  *   filter: 'published != false',
  *   limit: 100
@@ -73,6 +74,7 @@ function parseCollectionConfig(name, config) {
     return {
       name,
       path: config,
+      route: null,
       sort: null,
       filter: null,
       limit: 0,
@@ -83,6 +85,7 @@ function parseCollectionConfig(name, config) {
   return {
     name,
     path: config.path,
+    route: config.route || null,
     sort: config.sort || null,
     filter: config.filter || null,
     limit: config.limit || 0,
@@ -274,6 +277,15 @@ async function collectItems(siteDir, config) {
   // Filter out nulls (unpublished items)
   items = items.filter(Boolean)
 
+  // Add routes to items if collection has a route configured
+  if (config.route) {
+    const baseRoute = config.route.replace(/\/$/, '') // Remove trailing slash
+    items = items.map(item => ({
+      ...item,
+      route: `${baseRoute}/${item.slug}`
+    }))
+  }
+
   // Apply custom filter
   if (config.filter) {
     items = applyFilter(items, config.filter)
@@ -301,8 +313,8 @@ async function collectItems(siteDir, config) {
  *
  * @example
  * const collections = await processCollections('/path/to/site', {
- *   articles: { path: 'content/articles', sort: 'date desc' },
- *   products: 'content/products'
+ *   articles: { path: 'library/articles', sort: 'date desc' },
+ *   products: 'library/products'
  * })
  * // { articles: [...], products: [...] }
  */

package/src/site/content-collector.js

@@ -488,7 +488,7 @@ function determineIndexPage(orderConfig, availableFolders) {
  * @param {string} siteRoot - Site root directory for asset resolution
  * @param {Object} orderConfig - { pages: [...], index: 'name' } from parent's config
  * @param {Object} parentFetch - Parent page's fetch config (for dynamic child routes)
- * @returns {Promise<Object>} { pages, assetCollection, header, footer, left, right }
+ * @returns {Promise<Object>} { pages, assetCollection, header, footer, left, right, notFound }
  */
 async function collectPagesRecursive(dirPath, parentRoute, siteRoot, orderConfig = {}, parentFetch = null) {
   const entries = await readdir(dirPath)
@@ -502,6 +502,7 @@ async function collectPagesRecursive(dirPath, parentRoute, siteRoot, orderConfig
   let footer = null
   let left = null
   let right = null
+  let notFound = null
 
   // First pass: discover all page folders and read their order values
   const pageFolders = []
@@ -545,7 +546,7 @@ async function collectPagesRecursive(dirPath, parentRoute, siteRoot, orderConfig
       const { page, assetCollection: pageAssets } = result
       assetCollection = mergeAssetCollections(assetCollection, pageAssets)
 
-      // Handle special pages (layout areas) - only at root level
+      // Handle special pages (layout areas and 404) - only at root level
       if (parentRoute === '/') {
         if (entry === '@header') {
           header = page
@@ -555,6 +556,8 @@ async function collectPagesRecursive(dirPath, parentRoute, siteRoot, orderConfig
           left = page
         } else if (entry === '@right') {
           right = page
+        } else if (entry === '404') {
+          notFound = page
         } else {
           pages.push(page)
         }
@@ -575,7 +578,7 @@ async function collectPagesRecursive(dirPath, parentRoute, siteRoot, orderConfig
     }
   }
 
-  return { pages, assetCollection, header, footer, left, right }
+  return { pages, assetCollection, header, footer, left, right, notFound }
 }
 
 /**
@@ -608,7 +611,7 @@ export async function collectSiteContent(sitePath) {
   }
 
   // Recursively collect all pages
-  const { pages, assetCollection, header, footer, left, right } =
+  const { pages, assetCollection, header, footer, left, right, notFound } =
     await collectPagesRecursive(pagesPath, '/', sitePath, siteOrderConfig)
 
   // Sort pages by order
@@ -632,6 +635,7 @@ export async function collectSiteContent(sitePath) {
     footer,
     left,
     right,
+    notFound,
     assets: assetCollection.assets,
     hasExplicitPoster: assetCollection.hasExplicitPoster,
     hasExplicitPreview: assetCollection.hasExplicitPreview