@uniweb/build 0.48.0 → 0.49.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -58,14 +58,14 @@
     "sharp": "^0.35.3",
     "yaml": "^2.5.0",
     "@uniweb/content-reader": "^1.2.4",
-    "@uniweb/schemas": "^0.2.13",
-    "@uniweb/projections": "^0.7.0",
-    "@uniweb/theming": "^0.1.15",
+    "@uniweb/content-writer": "^0.3.4",
     "@uniweb/semantic-parser": "^1.4.0",
-    "@uniweb/content-writer": "^0.3.4"
+    "@uniweb/projections": "^0.7.1",
+    "@uniweb/schemas": "^0.2.13",
+    "@uniweb/theming": "^0.1.15"
   },
   "optionalDependencies": {
-    "@uniweb/runtime": "^0.23.0"
+    "@uniweb/runtime": "^0.24.0"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
@@ -74,7 +74,7 @@
     "@tailwindcss/vite": "^4.0.0",
     "@vitejs/plugin-react": "^4.0.0 || ^5.0.0",
     "vite-plugin-svgr": "^4.0.0",
-    "@uniweb/core": "^0.27.0"
+    "@uniweb/core": "^0.28.0"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/prerender.js

@@ -93,7 +93,9 @@ export function resolveExtensionPath(url, distDir, projectRoot, base) {
  *   baker for the views a concrete parametric page binds to its route
  */
 export async function executeAllFetches(siteContent, siteDir, onProgress, localeInfo) {
-  const fetchOptions = { siteRoot: siteDir, publicDir: 'public' }
+  // The locale this pass renders, which a `sort` collates texts in.
+  const locale = localeInfo?.locale ?? localeInfo?.defaultLocale ?? resolveDefaultLocale(siteContent.config) ?? null
+  const fetchOptions = { siteRoot: siteDir, publicDir: 'public', locale }
   const fetchedData = [] // Collected for DataStore pre-population
 
   // For non-default locales, translated collection data lives in dist/{locale}/data/
@@ -121,7 +123,7 @@ export async function executeAllFetches(siteContent, siteDir, onProgress, locale
 
   // Fetch options pointing to dist/ for localized data
   const localizedFetchOptions = isNonDefaultLocale
-    ? { siteRoot: localeInfo.distDir, publicDir: '.' }
+    ? { siteRoot: localeInfo.distDir, publicDir: '.', locale }
     : fetchOptions
   const optionsFor = (cfg, oneFetch) => (cfg.path !== oneFetch.path ? localizedFetchOptions : fetchOptions)
   const entry = (cfg, data, scope) => ({ config: cfg, data, meta: { whole: cfg.whole }, _scope: scope })

package/src/site/build-site-data.js

@@ -143,7 +143,8 @@ export async function buildSiteData({
       resolvedSiteRoot,
       siteContent.config.queries,
       siteContent.config?.paths?.entities,
-      basePath
+      basePath,
+      { locale: resolveDefaultLocale(siteContent.config) ?? null }
     )
     await writeQueryFiles(resolvedSiteRoot, byQuery, siteContent.config.queries)
 

package/src/site/data-fetcher.js

@@ -52,13 +52,17 @@ function getNestedValue(obj, path) {
  * records service refuses and the ruling dropped. A comma now THROWS here, at build
  * time, which is where an authoring error on the file lane belongs.
  *
+ * Texts are collated in `locale` — the page's (ruled 2026-09-14 [Diego]).
+ *
  * @param {Array} items - Items to sort
  * @param {string} sortExpr - Sort expression: `date`, `date desc`, `-date`
+ * @param {Object} [options]
+ * @param {string|null} [options.locale] - the page's locale
  * @returns {Array} Sorted items (new array)
  */
-export function applySort(items, sortExpr) {
+export function applySort(items, sortExpr, { locale = null } = {}) {
   if (!sortExpr || !Array.isArray(items)) return items
-  return sortRecords(items, sortExpr)
+  return sortRecords(items, sortExpr, { locale })
 }
 
 /**
@@ -88,9 +92,11 @@ export function applyWhere(items, where) {
  *
  * @param {any} data - Fetched data
  * @param {object} config - Fetch config with optional where, sort, limit
+ * @param {object} [options]
+ * @param {string|null} [options.locale] - the page's locale, which texts sort in
  * @returns {any} Processed data
  */
-export function applyPostProcessing(data, config) {
+export function applyPostProcessing(data, config, { locale = null } = {}) {
   if (!data || !Array.isArray(data)) return data
   if (!config.scope && !config.where && !config.sort && !config.limit) return data
 
@@ -109,7 +115,7 @@ export function applyPostProcessing(data, config) {
 
   // Apply sort
   if (config.sort) {
-    result = applySort(result, config.sort)
+    result = applySort(result, config.sort, { locale })
   }
 
   // Apply limit last
@@ -698,6 +704,7 @@ export function stripBuildOnlyFetchKeys(siteContent) {
  * @param {object} options - Execution options
  * @param {string} options.siteRoot - Site root directory
  * @param {string} [options.publicDir='public'] - Public directory name
+ * @param {string|null} [options.locale] - the page's locale, which a `sort` collates texts in
  * @returns {Promise<{ data: any, error?: string }>} Fetched data or error
  *
  * @example
@@ -773,7 +780,7 @@ export async function executeFetch(config, options = {}) {
     }
 
     // Apply post-processing (where, sort, limit)
-    data = applyPostProcessing(data, config)
+    data = applyPostProcessing(data, config, { locale: options.locale ?? null })
 
     // Ensure we return an array or object, defaulting to empty array
     return { data: data ?? [] }

package/src/site/plugin.js

@@ -136,7 +136,9 @@ export function shouldPrefetchInDev(cfg) {
  * @param {string} siteDir - Path to site directory
  */
 async function executeDevFetches(siteContent, siteDir) {
-  const fetchOptions = { siteRoot: siteDir, publicDir: 'public' }
+  // The page's locale, which a `sort` collates texts in.
+  const locale = siteContent.config?.activeLocale ?? resolveDefaultLocale(siteContent.config) ?? null
+  const fetchOptions = { siteRoot: siteDir, publicDir: 'public', locale }
   const fetchedData = []
   // Resolved the way the runtime resolves it (see prerender.js::executeAllFetches
   // for why): the SPA hydrates by the cache key of ITS resolved config.
@@ -825,7 +827,9 @@ export function siteContentPlugin(options = {}) {
 
           if (queriesConfig) {
             console.log('[site-content] Materializing queries...')
-            const byQuery = await processQueries(resolvedSitePath, queriesConfig, resolvedEntitiesDir, basePath)
+            const byQuery = await processQueries(resolvedSitePath, queriesConfig, resolvedEntitiesDir, basePath, {
+              locale: resolveDefaultLocale(earlyContent.config) ?? null,
+            })
             await writeQueryFiles(resolvedSitePath, byQuery, queriesConfig)
           }
         } catch (err) {

package/src/site/query-processor.js

@@ -617,7 +617,7 @@ function warnDuplicateSlugs(items, queryName) {
  * @param {Object} config - Parsed collection config
  * @returns {Promise<Array>} Array of processed items
  */
-async function collectItems(siteDir, config, entitiesDir, basePath) {
+async function collectItems(siteDir, config, entitiesDir, basePath, locale = null) {
   // ⭐ THE QUERY NAMES A SCHEMA AND THE POOL FOLLOWS — the same resolution the
   // sync lane makes, from the same reader, so the two lanes cannot disagree
   // about which files are a query's records. They used to: this one recursed
@@ -737,8 +737,9 @@ async function collectItems(siteDir, config, entitiesDir, basePath) {
 
   // The query's `sort` orders the file; the runtime applies whichever sort wins —
   // a binding's own, else this one — so the order here only spares it the work.
+  // Texts collate in the site's default language; each page re-sorts in its own.
   if (config.sort) {
-    items = applySort(items, config.sort)
+    items = applySort(items, config.sort, { locale })
   }
 
   // ⛔ `limit` IS NEVER BAKED (ruled 2026-09-13 [Diego]): it is how many a list
@@ -757,6 +758,10 @@ async function collectItems(siteDir, config, entitiesDir, basePath) {
  * @param {string} siteDir - Site root directory
  * @param {Object} queriesConfig - the resolved QUERY declarations
  * @param {string} [entitiesDir] - pool directory override (`site.yml::paths.entities`)
+ * @param {string} [basePath='/']
+ * @param {Object} [options]
+ * @param {string|null} [options.locale] - the site's default language, which a query's `sort`
+ *   collates texts in when it orders the compiled file
  * @returns {Promise<Object>} Map of collection name to items array
  *
  * @example
@@ -766,7 +771,7 @@ async function collectItems(siteDir, config, entitiesDir, basePath) {
  * })
  * // { articles: [...], products: [...] }
  */
-export async function processQueries(siteDir, queriesConfig, entitiesDir, basePath = '/') {
+export async function processQueries(siteDir, queriesConfig, entitiesDir, basePath = '/', { locale = null } = {}) {
   if (!queriesConfig || typeof queriesConfig !== 'object') {
     return {}
   }
@@ -818,7 +823,7 @@ export async function processQueries(siteDir, queriesConfig, entitiesDir, basePa
           (managed ? 'Check records.yml lists them.' : 'Check entities/.')
       )
     }
-    const items = await collectItems(siteDir, parsed, entitiesDir, basePath)
+    const items = await collectItems(siteDir, parsed, entitiesDir, basePath, locale)
     results[name] = items
     console.log(`[query-processor] Processed ${name}: ${items.length} items`)
   }