@uniweb/build 0.1.29 → 0.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -50,8 +50,8 @@
     "sharp": "^0.33.2"
   },
   "optionalDependencies": {
-    "@uniweb/runtime": "0.2.16",
-    "@uniweb/content-reader": "1.0.4"
+    "@uniweb/content-reader": "1.0.4",
+    "@uniweb/runtime": "0.2.17"
   },
   "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.14"
   },
   "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,11 @@ try {
  *
  * @example
  * // Simple form
- * parseCollectionConfig('articles', 'content/articles')
+ * parseCollectionConfig('articles', 'library/articles')
  *
  * // Extended form
  * parseCollectionConfig('articles', {
- *   path: 'content/articles',
+ *   path: 'library/articles',
  *   sort: 'date desc',
  *   filter: 'published != false',
  *   limit: 100
@@ -301,8 +301,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/plugin.js

@@ -37,6 +37,79 @@ import { collectSiteContent } from './content-collector.js'
 import { processAssets, rewriteSiteContentPaths } from './asset-processor.js'
 import { processAdvancedAssets } from './advanced-processors.js'
 import { processCollections, writeCollectionFiles } from './collection-processor.js'
+import { executeFetch, mergeDataIntoContent } from './data-fetcher.js'
+
+/**
+ * Execute all fetches for site content (used in dev mode)
+ * Populates section.cascadedData with fetched data
+ *
+ * @param {Object} siteContent - The collected site content
+ * @param {string} siteDir - Path to site directory
+ */
+async function executeDevFetches(siteContent, siteDir) {
+  const fetchOptions = { siteRoot: siteDir, publicDir: 'public' }
+
+  // Site-level fetch
+  let siteCascadedData = {}
+  const siteFetch = siteContent.config?.fetch
+  if (siteFetch) {
+    const result = await executeFetch(siteFetch, fetchOptions)
+    if (result.data && !result.error) {
+      siteCascadedData[siteFetch.schema] = result.data
+    }
+  }
+
+  // Process each page
+  for (const page of siteContent.pages || []) {
+    let pageCascadedData = { ...siteCascadedData }
+
+    // Page-level fetch
+    const pageFetch = page.fetch
+    if (pageFetch) {
+      const result = await executeFetch(pageFetch, fetchOptions)
+      if (result.data && !result.error) {
+        pageCascadedData[pageFetch.schema] = result.data
+      }
+    }
+
+    // Process sections
+    await processDevSectionFetches(page.sections, pageCascadedData, fetchOptions)
+  }
+}
+
+/**
+ * Process fetches for sections recursively
+ *
+ * @param {Array} sections - Sections to process
+ * @param {Object} cascadedData - Data from parent levels
+ * @param {Object} fetchOptions - Options for executeFetch
+ */
+async function processDevSectionFetches(sections, cascadedData, fetchOptions) {
+  if (!sections || !Array.isArray(sections)) return
+
+  for (const section of sections) {
+    // Execute section-level fetch
+    const sectionFetch = section.fetch
+    if (sectionFetch) {
+      const result = await executeFetch(sectionFetch, fetchOptions)
+      if (result.data && !result.error) {
+        // Merge fetched data into cascadedData for this section
+        cascadedData = {
+          ...cascadedData,
+          [sectionFetch.schema]: result.data
+        }
+      }
+    }
+
+    // Attach cascaded data to section
+    section.cascadedData = { ...cascadedData }
+
+    // Process subsections recursively
+    if (section.subsections && section.subsections.length > 0) {
+      await processDevSectionFetches(section.subsections, cascadedData, fetchOptions)
+    }
+  }
+}
 import { generateSearchIndex, isSearchEnabled, getSearchIndexFilename } from '../search/index.js'
 import { mergeTranslations } from '../i18n/merge.js'
 
@@ -372,6 +445,12 @@ export function siteContentPlugin(options = {}) {
           await writeCollectionFiles(resolvedSitePath, collections)
         }
 
+        // Execute data fetches in dev mode
+        // In production, prerender handles this
+        if (!isProduction) {
+          await executeDevFetches(siteContent, resolvedSitePath)
+        }
+
         // Update localesDir from site config
         if (siteContent.config?.i18n?.localesDir) {
           localesDir = siteContent.config.i18n.localesDir
@@ -402,6 +481,8 @@ export function siteContentPlugin(options = {}) {
             console.log('[site-content] Content changed, rebuilding...')
             try {
               siteContent = await collectSiteContent(resolvedSitePath)
+              // Execute fetches for the updated content
+              await executeDevFetches(siteContent, resolvedSitePath)
               console.log(`[site-content] Rebuilt ${siteContent.pages?.length || 0} pages`)
 
               // Send full reload to client