@rettangoli/sites 1.0.1 → 1.0.3

package/README.md

@@ -33,7 +33,7 @@ my-site/
 - YAML pages rendered through `jempl` + `yahtml`
 - Markdown pages rendered through `markdown-it` + Shiki (default `rtglMarkdown`)
 - Frontmatter (`template`, `tags`, arbitrary page metadata)
-- Global data (`data/*.yaml`) merged with page frontmatter
+- Global data from `data/*.yaml` and optional inline `sites.config.yaml data`
 - Collections built from page tags
 - `$if`, `$for`, `$partial`, template functions
 - Static file copying from `static/` to `_site/`
@@ -75,6 +75,9 @@ imports:
     docs: https://example.com/templates/docs.yaml
   partials:
     docs/nav: https://example.com/partials/docs-nav.yaml
+data:
+  themeCssHref: /public/theme.css
+  themeBodyClass: dark
 ```
 
 In the default starter template, CDN runtime scripts are controlled via `data/site.yaml`:
@@ -97,6 +100,10 @@ Example mappings:
 - page frontmatter: `template: base` or `template: docs`
 - template/page content: `$partial: docs/nav`
 
+Use top-level `data` in `sites.config.yaml` for small global values that do not deserve their own `data/*.yaml` file.
+`sites.config.yaml data` and `data/*.yaml` are merged, with `data/*.yaml` winning on conflicts.
+Inline config data requires `rtgl >= 1.1.4` or `@rettangoli/sites >= 1.0.3`.
+
 Imported files are cached on disk under `.rettangoli/sites/imports/{templates|partials}/` (hashed filenames).
 Alias/url/hash mapping is tracked in `.rettangoli/sites/imports/index.yaml`.
 Build is cache-first: if a cached file exists, it is used without a network request.
@@ -210,7 +217,7 @@ Use VT against your generated site:
 Docker runtime (recommended for stable Playwright/browser versions):
 
 ```bash
-IMAGE="han4wluc/rtgl:playwright-v1.57.0-rtgl-v1.0.5"
+IMAGE="han4wluc/rtgl:playwright-v1.57.0-rtgl-v1.1.0"
 docker pull "$IMAGE"
 docker run --rm -v "$PWD:/workspace" -w /workspace "$IMAGE" rtgl vt screenshot
 docker run --rm -v "$PWD:/workspace" -w /workspace "$IMAGE" rtgl vt report

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rettangoli/sites",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Generate static sites using Markdown and YAML for docs, blogs, and marketing sites.",
   "author": {
     "name": "Luciano Hanyon Wu",

package/src/builtinTemplateFunctions.js

@@ -177,6 +177,10 @@ function mdImpl(content) {
   };
 }
 
+function defaultImpl(value, fallbackValue = '') {
+  return value == null || value === '' ? fallbackValue : value;
+}
+
 export const builtinTemplateFunctions = {
   encodeURI: (value) => encodeURI(String(value ?? '')),
   encodeURIComponent: (value) => encodeURIComponent(String(value ?? '')),
@@ -188,6 +192,7 @@ export const builtinTemplateFunctions = {
   sort: sortImpl,
   chunk: chunkImpl,
   md: mdImpl,
+  default: defaultImpl,
   toQueryString,
 };
 

package/src/cli/build.js

@@ -31,6 +31,7 @@ export const buildSite = async (options = {}) => {
     markdown: config.markdown || {},
     keepMarkdownFiles: config.build?.keepMarkdownFiles === true,
     imports: config.imports || {},
+    data: config.data || {},
     functions: functions || {},
     quiet,
     isScreenshotMode

package/src/createSiteBuilder.js

@@ -17,22 +17,25 @@ const MATTER_OPTIONS = {
 
 // Deep merge utility function
 function deepMerge(target, source) {
-  const output = { ...target };
-  
-  if (isObject(target) && isObject(source)) {
-    Object.keys(source).forEach(key => {
-      if (isObject(source[key])) {
-        if (!(key in target)) {
-          Object.assign(output, { [key]: source[key] });
-        } else {
-          output[key] = deepMerge(target[key], source[key]);
-        }
-      } else {
-        Object.assign(output, { [key]: source[key] });
-      }
-    });
+  if (!isObject(source)) {
+    return source;
+  }
+
+  if (!isObject(target)) {
+    return { ...source };
   }
-  
+
+  const output = { ...target };
+
+  Object.keys(source).forEach(key => {
+    if (isObject(source[key]) && isObject(target[key])) {
+      output[key] = deepMerge(target[key], source[key]);
+      return;
+    }
+
+    Object.assign(output, { [key]: source[key] });
+  });
+
   return output;
 }
 
@@ -314,6 +317,7 @@ export function createSiteBuilder({
   markdown = {},
   keepMarkdownFiles = false,
   imports = {},
+  data = {},
   fetchImpl,
   functions = {},
   quiet = false,
@@ -409,9 +413,13 @@ export function createSiteBuilder({
       readPartialsRecursively(partialsDir);
     }
 
+    if (!isObject(data)) {
+      throw new Error('Invalid site data: expected an object.');
+    }
+
     // Read all data files and create a JSON object
     const dataDir = path.join(rootDir, 'data');
-    const globalData = {};
+    const fileData = {};
 
     if (fs.existsSync(dataDir)) {
       const files = fs.readdirSync(dataDir);
@@ -421,11 +429,13 @@ export function createSiteBuilder({
           const fileContent = fs.readFileSync(filePath, 'utf8');
           const nameWithoutExt = path.basename(file, path.extname(file));
           // Load YAML content and store under filename key
-          globalData[nameWithoutExt] = yaml.load(fileContent, { schema: yaml.JSON_SCHEMA });
+          fileData[nameWithoutExt] = yaml.load(fileContent, { schema: yaml.JSON_SCHEMA });
         }
       });
     }
 
+    const globalData = deepMerge(data, fileData);
+
     // Read all templates and create a JSON object
     const templatesDir = path.join(rootDir, 'templates');
     const templates = { ...importedTemplates };

package/src/utils/loadSiteConfig.js

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import yaml from 'js-yaml';
 
-const ALLOWED_TOP_LEVEL_KEYS = new Set(['markdown', 'markdownit', 'build', 'imports']);
+const ALLOWED_TOP_LEVEL_KEYS = new Set(['markdown', 'markdownit', 'build', 'imports', 'data']);
 const MARKDOWN_BOOLEAN_KEYS = new Set(['html', 'linkify', 'typographer', 'breaks', 'xhtmlOut']);
 const MARKDOWN_STRING_KEYS = new Set(['langPrefix', 'quotes', 'preset']);
 const MARKDOWN_NUMBER_KEYS = new Set(['maxNesting']);
@@ -121,6 +121,25 @@ function validateBuildConfig(value, configPath) {
   return { ...value };
 }
 
+function validateDataConfig(value, configPath) {
+  if (!isPlainObject(value)) {
+    throw new Error(`Invalid data config in "${configPath}": expected an object.`);
+  }
+
+  const normalized = {};
+
+  for (const [rawKey, rawValue] of Object.entries(value)) {
+    const key = String(rawKey).trim();
+    if (key === '') {
+      throw new Error(`Invalid data config in "${configPath}": keys must be non-empty.`);
+    }
+
+    normalized[key] = rawValue;
+  }
+
+  return normalized;
+}
+
 function validateImportUrl(url, configPath, groupKey, alias) {
   if (typeof url !== 'string' || url.trim() === '') {
     throw new Error(`Invalid imports.${groupKey} value for alias "${alias}" in "${configPath}": expected a non-empty URL string.`);
@@ -200,7 +219,7 @@ function validateConfig(rawConfig, configPath) {
   for (const key of Object.keys(config)) {
     if (!ALLOWED_TOP_LEVEL_KEYS.has(key)) {
       throw new Error(
-        `Unsupported key "${key}" in "${configPath}". Supported keys: markdownit (recommended), markdown (legacy alias), build, imports.`
+        `Unsupported key "${key}" in "${configPath}". Supported keys: markdownit (recommended), markdown (legacy alias), build, imports, data.`
       );
     }
   }
@@ -292,6 +311,10 @@ function validateConfig(rawConfig, configPath) {
     normalizedConfig.imports = validateImportsConfig(config.imports, configPath);
   }
 
+  if (config.data !== undefined) {
+    normalizedConfig.data = validateDataConfig(config.data, configPath);
+  }
+
   return normalizedConfig;
 }