@lownoise-studio/rendershield 0.3.1 → 1.0.0

package/src/core/loadMarkdown.ts

@@ -4,6 +4,7 @@ import fs from "fs-extra";
 import matter from "gray-matter";
 import MarkdownIt from "markdown-it";
 import { MarkdownDoc, RenderShieldConfig } from "../types.js";
+import { renderShieldError } from "../errors.js";
 
 const md = new MarkdownIt({ html: false, linkify: true, typographer: true });
 
@@ -11,7 +12,8 @@ const REQUIRED_FIELDS = "title, excerpt, datePublished, coverImage, slug";
 
 function requireString(value: unknown, field: string, file: string): string {
   if (typeof value !== "string" || value.trim().length === 0) {
-    throw new Error(
+    throw renderShieldError(
+      "CONTENT_INVALID",
       `Missing required frontmatter field "${field}" in ${file}. Required fields: ${REQUIRED_FIELDS}`
     );
   }
@@ -25,7 +27,10 @@ function normalizeDate(value: unknown, file: string): string {
   if (value instanceof Date) {
     return value.toISOString().slice(0, 10);
   }
-  throw new Error(`Invalid datePublished in ${file}. Use format YYYY-MM-DD.`);
+  throw renderShieldError(
+    "CONTENT_INVALID",
+    `Invalid datePublished in ${file}. Use format YYYY-MM-DD.`
+  );
 }
 
 export async function loadAllMarkdownDocs(cfg: RenderShieldConfig, cwd = process.cwd()): Promise<MarkdownDoc[]> {
@@ -47,7 +52,8 @@ export async function loadAllMarkdownDocs(cfg: RenderShieldConfig, cwd = process
 
       const datePublishedRaw = parsed.data?.datePublished;
       if (datePublishedRaw === undefined || datePublishedRaw === null) {
-        throw new Error(
+        throw renderShieldError(
+          "CONTENT_INVALID",
           `Missing required frontmatter field "datePublished" in ${abs}. Required fields: ${REQUIRED_FIELDS}`
         );
       }

package/src/core/renderHtml.ts

@@ -1,4 +1,4 @@
-import { MarkdownDoc, RenderShieldConfig } from "../types.js";
+import { MarkdownDoc, RenderShieldConfig, SchemaType } from "../types.js";
 
 function escapeHtml(s: string): string {
   return s
@@ -15,6 +15,37 @@ function joinUrl(base: string, pathname: string): string {
   return b + p;
 }
 
+function resolveSchemaType(cfg: RenderShieldConfig, doc: MarkdownDoc): SchemaType {
+  const collection = cfg.content.markdown.collections.find((c) => c.name === doc.collection);
+  return collection?.schemaType ?? "Article";
+}
+
+function buildJsonLd(
+  schemaType: SchemaType,
+  cfg: RenderShieldConfig,
+  doc: MarkdownDoc,
+  canonicalUrl: string,
+  ogImageUrl: string
+): Record<string, unknown> {
+  const base = {
+    "@context": "https://schema.org",
+    "@type": schemaType,
+    mainEntityOfPage: canonicalUrl,
+    image: ogImageUrl,
+  };
+
+  if (schemaType === "WebPage") {
+    return { ...base, name: doc.title };
+  }
+
+  return {
+    ...base,
+    headline: doc.title,
+    author: { "@type": "Person", name: cfg.site.authorName },
+    datePublished: doc.datePublished,
+  };
+}
+
 export function renderPageHtml(cfg: RenderShieldConfig, doc: MarkdownDoc): string {
   const canonicalUrl = joinUrl(cfg.site.canonicalBase, doc.routePath);
   const ogImageUrl = doc.coverImage.startsWith("http")
@@ -23,16 +54,9 @@ export function renderPageHtml(cfg: RenderShieldConfig, doc: MarkdownDoc): strin
 
   const title = `${doc.title} - ${cfg.site.siteName}`;
   const description = doc.excerpt;
-
-  const jsonLd = {
-    "@context": "https://schema.org",
-    "@type": "Article",
-    headline: doc.title,
-    author: { "@type": "Person", name: cfg.site.authorName },
-    datePublished: doc.datePublished,
-    image: ogImageUrl,
-    mainEntityOfPage: canonicalUrl,
-  };
+  const schemaType = resolveSchemaType(cfg, doc);
+  const ogType = schemaType === "WebPage" ? "website" : "article";
+  const jsonLd = buildJsonLd(schemaType, cfg, doc, canonicalUrl, ogImageUrl);
 
   // NOTE: doc.htmlContent is already HTML from markdown-it.
   // We trust it as generated output, not user-injected raw HTML (markdown-it html:false).
@@ -46,7 +70,7 @@ export function renderPageHtml(cfg: RenderShieldConfig, doc: MarkdownDoc): strin
   <meta name="description" content="${escapeHtml(description)}">
   <link rel="canonical" href="${escapeHtml(canonicalUrl)}">
 
-  <meta property="og:type" content="article">
+  <meta property="og:type" content="${ogType}">
   <meta property="og:title" content="${escapeHtml(doc.title)}">
   <meta property="og:description" content="${escapeHtml(description)}">
   <meta property="og:image" content="${escapeHtml(ogImageUrl)}">