@zeropress/build-core 0.2.2 → 0.5.0

package/README.md

@@ -55,7 +55,6 @@ import {
   - `sitemap.xml`
   - `feed.xml`
   - `robots.txt`
-  - `meta.json`
 - writing outputs through a pluggable writer
 
 It does not:
@@ -120,7 +119,7 @@ Notes:
 - `previewData` must already satisfy the canonical preview-data contract
 - `themePackage` must already be a validated in-memory theme package
 - `sitemap.xml` and `feed.xml` are emitted only when `site.url` is a non-empty canonical URL
-- `robots.txt` and `meta.json` are still emitted when `generateSpecialFiles` is enabled
+- `robots.txt` is still emitted when `generateSpecialFiles` is enabled
 
 ### `buildSiteFromThemeDir(input)`
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeropress/build-core",
-  "version": "0.2.2",
+  "version": "0.5.0",
   "description": "Shared ZeroPress build core",
   "type": "module",
   "license": "MIT",
@@ -34,8 +34,8 @@
   },
   "dependencies": {
     "@zeropress/slug-policy": "^0.1.0",
-    "@zeropress/preview-data-validator": "^0.4.5",
-    "@zeropress/theme-validator": "^0.5.0",
+    "@zeropress/preview-data-validator": "0.5.0",
+    "@zeropress/theme-validator": "0.5.1",
     "highlight.js": "^11.11.1",
     "markdown-it": "^14.1.0",
     "markdown-it-anchor": "^9.2.0"

package/src/api/build-site.js

@@ -83,7 +83,6 @@ export async function buildSite(input) {
       await writeOutput(state.writer, state.summaries, 'feed.xml', buildFeedXml(state.previewData.site, state.emitted, state.generatedAt), 'application/rss+xml');
     }
     await writeOutput(state.writer, state.summaries, 'robots.txt', buildRobotsTxt(state.previewData.site), 'text/plain');
-    await writeOutput(state.writer, state.summaries, 'meta.json', buildMetaJson(state.previewData.site, state.emitted, state.generatedAt), 'application/json');
   }
 
   return finalizeBuildResult(state.writer, state.summaries, options);
@@ -94,7 +93,7 @@ async function createBuildState(input, options) {
     throw new Error('buildSite requires a writer with an async write(file) method');
   }
 
-  assertPreviewData(input.previewData);
+  assertBuildPreviewData(input.previewData);
   const themePackage = await normalizeAndValidateThemePackage(input.themePackage);
 
   const engine = new ZeroPressEngine();
@@ -125,6 +124,7 @@ async function createBuildState(input, options) {
     assetOutputs,
     assetMap,
     customCssHref: customCssAsset ? `/${customCssAsset.path}` : '',
+    customHtml: previewData.custom_html,
     commentPolicyContent: buildCommentPolicyManifest(renderData.posts),
     options,
     generatedAt: new Date(),
@@ -139,6 +139,18 @@ async function createBuildState(input, options) {
   };
 }
 
+function assertBuildPreviewData(previewData) {
+  try {
+    assertPreviewData(previewData);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (message.startsWith('Invalid preview-data')) {
+      throw error;
+    }
+    throw new Error(`Invalid preview-data: ${message}`);
+  }
+}
+
 async function finalizeBuildResult(writer, summaries, options) {
   let manifest;
   if (options.writeManifest) {
@@ -168,6 +180,7 @@ async function renderRoute(state, templateName, route) {
     {
       menus: state.previewData.menus,
       widgets: state.widgets,
+      taxonomies: state.renderData.taxonomies,
       ...route,
       meta: buildPageMeta(state.previewData.site, {
         currentUrl,
@@ -179,7 +192,7 @@ async function renderRoute(state, templateName, route) {
     createRenderContext(state.previewData.site, currentUrl),
   );
   html = state.assetProcessor.updateAssetReferences(html, state.assetMap);
-  html = injectCustomCssAssetLink(html, state.customCssHref);
+  html = injectSiteCustomizations(html, state);
   await writeOutput(state.writer, state.summaries, routePathToOutputPath(route.path, state.previewData.site.permalinks.output_style), html, 'text/html');
   recordRouteEmission(state, templateName, route, currentUrl);
 }
@@ -191,6 +204,7 @@ async function renderPost(state, post) {
     {
       menus: state.previewData.menus,
       widgets: state.widgets,
+      taxonomies: state.renderData.taxonomies,
       post,
       meta: buildPageMeta(state.previewData.site, {
         currentUrl,
@@ -205,7 +219,7 @@ async function renderPost(state, post) {
     createRenderContext(state.previewData.site, currentUrl),
   );
   html = state.assetProcessor.updateAssetReferences(html, state.assetMap);
-  html = injectCustomCssAssetLink(html, state.customCssHref);
+  html = injectSiteCustomizations(html, state);
   await writeOutput(state.writer, state.summaries, routePathToOutputPath(post.url, state.previewData.site.permalinks.output_style), html, 'text/html');
   state.emitted.posts.push({
     url: currentUrl,
@@ -224,6 +238,7 @@ async function renderPage(state, page) {
     {
       menus: state.previewData.menus,
       widgets: state.widgets,
+      taxonomies: state.renderData.taxonomies,
       page,
       meta: buildPageMeta(state.previewData.site, {
         currentUrl,
@@ -236,7 +251,7 @@ async function renderPage(state, page) {
     createRenderContext(state.previewData.site, currentUrl),
   );
   html = state.assetProcessor.updateAssetReferences(html, state.assetMap);
-  html = injectCustomCssAssetLink(html, state.customCssHref);
+  html = injectSiteCustomizations(html, state);
   await writeOutput(state.writer, state.summaries, routePathToOutputPath(page.url, state.previewData.site.permalinks.output_style), html, 'text/html');
   state.emitted.pages.push({
     url: currentUrl,
@@ -256,6 +271,7 @@ async function maybeRenderNotFoundPage(state) {
     {
       menus: state.previewData.menus,
       widgets: state.widgets,
+      taxonomies: state.renderData.taxonomies,
       meta: buildPageMeta(state.previewData.site, {
         currentUrl: '/404.html',
         title: state.previewData.site.title,
@@ -266,7 +282,7 @@ async function maybeRenderNotFoundPage(state) {
     createRenderContext(state.previewData.site, '/404.html'),
   );
   html = state.assetProcessor.updateAssetReferences(html, state.assetMap);
-  html = injectCustomCssAssetLink(html, state.customCssHref);
+  html = injectSiteCustomizations(html, state);
   await writeOutput(state.writer, state.summaries, '404.html', html, 'text/html');
 }
 
@@ -290,6 +306,7 @@ function normalizePreviewData(previewData) {
     site: normalizedSite,
     widgets: normalizeWidgetAreas(previewData.widgets, normalizedSite.mediaBaseUrl),
     custom_css: normalizeCustomCss(previewData.custom_css),
+    custom_html: normalizeCustomHtml(previewData.custom_html),
     content: {
       ...previewData.content,
       authors: previewData.content.authors.map((author) => ({
@@ -357,6 +374,23 @@ function normalizeCustomCss(customCss) {
   return content ? { content } : undefined;
 }
 
+function normalizeCustomHtml(customHtml) {
+  if (!customHtml || typeof customHtml !== 'object') {
+    return undefined;
+  }
+
+  const headEnd = normalizeOptionalRawString(customHtml.head_end?.content);
+  const bodyEnd = normalizeOptionalRawString(customHtml.body_end?.content);
+  if (!headEnd && !bodyEnd) {
+    return undefined;
+  }
+
+  return {
+    ...(headEnd ? { head_end: { content: headEnd } } : {}),
+    ...(bodyEnd ? { body_end: { content: bodyEnd } } : {}),
+  };
+}
+
 function normalizePermalinks(permalinks) {
   const source = permalinks && typeof permalinks === 'object' ? permalinks : {};
   const outputStyle = typeof source.output_style === 'string' && PERMALINK_OUTPUT_STYLES.has(source.output_style)
@@ -407,6 +441,7 @@ function createRenderData(previewData, themeMetadata = {}) {
     posts,
     pages,
     postBySlug,
+    taxonomies: buildGlobalTaxonomies(previewData, categoryCountBySlug, tagCountBySlug),
     indexRoutes: buildPaginatedCollection({
       items: previewData.content.posts,
       postsPerPage: previewData.site.postsPerPage,
@@ -458,6 +493,23 @@ function createRenderData(previewData, themeMetadata = {}) {
   };
 }
 
+function buildGlobalTaxonomies(previewData, categoryCountBySlug, tagCountBySlug) {
+  return {
+    categories: buildGlobalTaxonomyItems(previewData.site, 'categories', previewData.content.categories, categoryCountBySlug),
+    tags: buildGlobalTaxonomyItems(previewData.site, 'tags', previewData.content.tags, tagCountBySlug),
+  };
+}
+
+function buildGlobalTaxonomyItems(site, permalinkKind, items, countBySlug) {
+  return items.map((item) => ({
+    name: item.name,
+    slug: item.slug,
+    url: resolvePermalink(site, permalinkKind, item).url,
+    count: countBySlug.get(item.slug) || 0,
+    description: typeof item.description === 'string' ? item.description : '',
+  }));
+}
+
 function resolveWidgetAreas(previewData, renderData) {
   if (!previewData.widgets || typeof previewData.widgets !== 'object') {
     return {};
@@ -1144,6 +1196,10 @@ function normalizeOptionalString(value) {
   return typeof value === 'string' && value.trim() ? value.trim() : '';
 }
 
+function normalizeOptionalRawString(value) {
+  return typeof value === 'string' && value.trim() ? value : '';
+}
+
 function normalizeLocale(value) {
   if (typeof value !== 'string' || !value.trim()) {
     return DEFAULT_LOCALE;
@@ -1625,7 +1681,7 @@ function assertPlannedOutputPathsSafe(state) {
   ];
 
   if (state.options.generateSpecialFiles) {
-    plannedPaths.push('404.html', 'robots.txt', 'meta.json');
+    plannedPaths.push('404.html', 'robots.txt');
     if (hasCanonicalSiteUrl(state.previewData.site.url)) {
       plannedPaths.push('sitemap.xml', 'feed.xml');
     }
@@ -1724,6 +1780,12 @@ function sha256(content) {
   return hash.digest('hex');
 }
 
+function injectSiteCustomizations(html, state) {
+  let next = injectCustomCssAssetLink(html, state.customCssHref);
+  next = injectCustomHtml(next, state.customHtml);
+  return next;
+}
+
 function injectCustomCssAssetLink(html, href) {
   if (!normalizeOptionalString(href)) {
     return html;
@@ -1732,6 +1794,21 @@ function injectCustomCssAssetLink(html, href) {
   return html.replace('</head>', `  <link rel="stylesheet" href="${escapeHtml(href)}">\n</head>`);
 }
 
+function injectCustomHtml(html, customHtml) {
+  let next = html;
+  const headEnd = normalizeOptionalRawString(customHtml?.head_end?.content);
+  const bodyEnd = normalizeOptionalRawString(customHtml?.body_end?.content);
+
+  if (headEnd) {
+    next = next.replace('</head>', `${headEnd}\n</head>`);
+  }
+  if (bodyEnd) {
+    next = next.replace('</body>', `${bodyEnd}\n</body>`);
+  }
+
+  return next;
+}
+
 function buildSitemapXml(site, emitted, generatedAt) {
   const entries = [
     ...emitted.indexRoutes
@@ -1788,38 +1865,6 @@ function buildRobotsTxt(site) {
   return `${lines.join('\n')}\n`;
 }
 
-function buildMetaJson(site, emitted, generatedAt) {
-  const pages = [
-    ...emitted.posts.map((post) => ({
-      url: post.url,
-      title: post.title,
-      description: post.description,
-      publishedAt: post.publishedAt,
-      updatedAt: post.updatedAt,
-      type: 'post',
-      metadata: { status: post.status },
-    })),
-    ...emitted.pages.map((page) => ({
-      url: page.url,
-      title: page.title,
-      description: page.description,
-      type: 'page',
-      metadata: { status: page.status },
-    })),
-  ];
-
-  return JSON.stringify({
-    generated: formatUtcIsoSeconds(generatedAt),
-    site: {
-      title: site.title,
-      description: site.description,
-      url: site.url,
-      locale: site.locale,
-    },
-    pages,
-  }, null, 2);
-}
-
 function getContentType(assetPath) {
   const ext = assetPath.split('.').pop()?.toLowerCase();
   const contentTypes = {

package/src/render/control-flow-renderer.js

@@ -1,8 +1,9 @@
 import { parsePartialToken } from './partial-resolver.js';
 
-const PATH_REGEX = /^[a-zA-Z_][a-zA-Z0-9_]*(?:\.[a-zA-Z_][a-zA-Z0-9_]*)*$/;
-const FOR_EXPRESSION_REGEX = /^([a-zA-Z_][a-zA-Z0-9_]*)\s+in\s+([a-zA-Z_][a-zA-Z0-9_]*(?:\.[a-zA-Z_][a-zA-Z0-9_]*)*)$/;
-const IF_EQ_EXPRESSION_REGEX = /^([a-zA-Z_][a-zA-Z0-9_]*(?:\.[a-zA-Z_][a-zA-Z0-9_]*)*)\s+("(?:[^"\\]|\\.)*")$/;
+const PATH_SEGMENT_SOURCE = '[a-zA-Z_][a-zA-Z0-9_]*(?:-[a-zA-Z0-9_]+)*';
+const PATH_REGEX = new RegExp(`^${PATH_SEGMENT_SOURCE}(?:\\.${PATH_SEGMENT_SOURCE})*$`);
+const FOR_EXPRESSION_REGEX = new RegExp(`^([a-zA-Z_][a-zA-Z0-9_]*)\\s+in\\s+(${PATH_SEGMENT_SOURCE}(?:\\.${PATH_SEGMENT_SOURCE})*)$`);
+const IF_EQ_EXPRESSION_REGEX = new RegExp(`^(${PATH_SEGMENT_SOURCE}(?:\\.${PATH_SEGMENT_SOURCE})*)\\s+("(?:[^"\\\\]|\\\\.)*")$`);
 
 export class ControlFlowRenderer {
   constructor(options = {}) {

package/src/render/variable-resolver.js

@@ -1,7 +1,7 @@
 export class VariableResolver {
   static MENU_PATTERN = /\{\{menu:([a-z][a-z0-9_-]{0,63})\}\}/g;
-  static VARIABLE_PATTERN = /\{\{([a-zA-Z_][a-zA-Z0-9_]*(?:\.[a-zA-Z_][a-zA-Z0-9_]*)+)\}\}/g;
-  static STANDALONE_PATTERN = /\{\{([a-zA-Z_][a-zA-Z0-9_]*)\}\}/g;
+  static VARIABLE_PATTERN = /\{\{([a-zA-Z_][a-zA-Z0-9_]*(?:-[a-zA-Z0-9_]+)*(?:\.[a-zA-Z_][a-zA-Z0-9_]*(?:-[a-zA-Z0-9_]+)*)+)\}\}/g;
+  static STANDALONE_PATTERN = /\{\{([a-zA-Z_][a-zA-Z0-9_]*(?:-[a-zA-Z0-9_]+)*)\}\}/g;
 
   resolve(template, data, options = {}) {
     let result = template.replace(VariableResolver.MENU_PATTERN, (_, menuId) => {