@daz4126/swifty 2.6.0 → 2.7.0

package/README.md

@@ -12,6 +12,7 @@ Swifty uses convention over configuration to make it super simple to build blazi
 - **Auto-injected CSS/JS** from your css/ and js/ folders
 - **Code syntax highlighting** via highlight.js
 - **Tags and navigation** generated automatically
+- **RSS feed generation** for blogs and content folders
 - **Optional [Turbo](https://turbo.hotwired.dev/)** for SPA-like transitions
 
 ## Quickstart

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daz4126/swifty",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "main": "index.js",
   "type": "module",
   "bin": {

package/src/build.js

@@ -1,5 +1,6 @@
 import { copyAssets, optimizeImages } from "./assets.js";
 import { generatePages, createPages, addLinks } from "./pages.js";
+import { generateRssFeeds } from "./rss.js";
 import { dirs } from "./config.js";
 
 export default async function build(outputDir) {
@@ -8,4 +9,5 @@ export default async function build(outputDir) {
   const pages = await generatePages(dirs.pages);
   await addLinks(pages);
   await createPages(pages, outputDir);
+  await generateRssFeeds(pages, outputDir);
 }

package/src/layout.js

@@ -5,6 +5,8 @@ import { dirs, baseDir, defaultConfig } from "./config.js";
 import { getCssImports, getJsImports } from "./assets.js";
 
 const layoutCache = new Map();
+let template = null;
+
 const getLayout = async (layoutName) => {
   if (!layoutName) return null;
   if (!layoutCache.has(layoutName)) {
@@ -44,6 +46,16 @@ const applyLayoutAndWrapContent = async (page,content) => {
     return layoutContent.replace(/\{\{\s*content\s*\}\}/g, () => content);
   };
 
-const template = await createTemplate();
+const getTemplate = async () => {
+  if (!template) {
+    template = await createTemplate();
+  }
+  return template;
+};
+
+const resetCaches = async () => {
+  layoutCache.clear();
+  template = await createTemplate();
+};
 
-export { getLayout, applyLayoutAndWrapContent, template };
+export { getLayout, applyLayoutAndWrapContent, getTemplate, resetCaches };

package/src/pages.js

@@ -1,7 +1,7 @@
 // pages.js
 import { replacePlaceholders } from "./partials.js";
 import { dirs, defaultConfig, loadConfig } from "./config.js";
-import { template, applyLayoutAndWrapContent } from "./layout.js";
+import { getTemplate, applyLayoutAndWrapContent } from "./layout.js";
 import { marked } from "marked";
 import matter from "gray-matter";
 import fs from "fs/promises";
@@ -78,7 +78,7 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
           undefined,
           config.dateFormat,
         ),
-        date: new Date(stats.mtime).toLocaleDateString(
+        date: new Date(stats.birthtime).toLocaleDateString(
           undefined,
           config.dateFormat,
         ),
@@ -111,7 +111,7 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
           if (a.data.position && b.data.position) {
             return a.data.position - b.data.position;
           }
-          return new Date(a.updated_at) - new Date(b.updated_at);
+          return new Date(b.created_at) - new Date(b.created_at);
         });
 
         page.content = await generateLinkList(page.filename, page.pages);
@@ -177,7 +177,10 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
 const generateLinkList = async (name, pages) => {
   const partial = `${name}.md`;
   const partialPath = path.join(dirs.partials, partial);
-  const linksPath = path.join(dirs.partials, defaultConfig.default_link_name || "links");
+  const linksPath = path.join(
+    dirs.partials,
+    defaultConfig.default_link_name || "links",
+  );
   // Check if either file exists in the 'partials' folder
   const fileExists = await fsExtra.pathExists(partialPath);
   const defaultExists = await fsExtra.pathExists(linksPath);
@@ -200,6 +203,7 @@ const render = async (page) => {
   const htmlContent = marked.parse(replacedContent); // Markdown processed once
   const wrappedContent = await applyLayoutAndWrapContent(page, htmlContent);
   // Use function to avoid $` special replacement patterns in content
+  const template = await getTemplate();
   const htmlWithTemplate = template.replace(
     /\{\{\s*content\s*\}\}/g,
     () => wrappedContent,

package/src/partials.js

@@ -34,7 +34,17 @@ const replacePlaceholders = async (template, values) => {
     return str.replace(regex, () => results.shift());
   };
 
-  // Replace partial includes
+  // Protect code blocks BEFORE any placeholder replacement
+  // Fenced blocks require closing ``` to be at start of line (after newline)
+  const codeBlockRegex =
+    /```[\s\S]*?\n```|`[^`\n]+`|<(pre|code)[^>]*>[\s\S]*?<\/\1>/g;
+  const codeBlocks = [];
+  template = template.replace(codeBlockRegex, (match) => {
+    codeBlocks.push(match);
+    return `{{CODE_BLOCK_${codeBlocks.length - 1}}}`; // Temporary placeholder
+  });
+
+  // Replace partial includes (now only outside code blocks)
   template = await replaceAsync(
     template,
     partialRegex,
@@ -44,16 +54,8 @@ const replacePlaceholders = async (template, values) => {
       return marked(partialContent); // Convert Markdown to HTML
     },
   );
-  // Replace other placeholders **only outside of code blocks**
-  // Fenced blocks require closing ``` to be at start of line (after newline)
-  const codeBlockRegex =
-    /```[\s\S]*?\n```|`[^`\n]+`|<(pre|code)[^>]*>[\s\S]*?<\/\1>/g;
-  const codeBlocks = [];
-  template = template.replace(codeBlockRegex, (match) => {
-    codeBlocks.push(match);
-    return `{{CODE_BLOCK_${codeBlocks.length - 1}}}`; // Temporary placeholder
-  });
-  // Replace placeholders outside of code blocks
+
+  // Replace other placeholders outside of code blocks
   template = template.replace(/{{\s*([^}\s]+)\s*}}/g, (match, key) => {
     return values.data && key in values?.data
       ? values.data[key]
@@ -61,6 +63,7 @@ const replacePlaceholders = async (template, values) => {
         ? values[key]
         : match;
   });
+
   // Restore code blocks
   template = template.replace(
     /{{CODE_BLOCK_(\d+)}}/g,
@@ -71,4 +74,8 @@ const replacePlaceholders = async (template, values) => {
   return template;
 };
 
-export { loadPartial, replacePlaceholders };
+const clearCache = () => {
+  partialCache.clear();
+};
+
+export { loadPartial, replacePlaceholders, clearCache };

package/src/rss.js

@@ -0,0 +1,145 @@
+import fs from "fs/promises";
+import fsExtra from "fs-extra";
+import path from "path";
+import { defaultConfig } from "./config.js";
+
+// Escape XML special characters
+const escapeXml = (str) => {
+  if (!str) return "";
+  return str
+    .replace(/&/g, "&")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&apos;");
+};
+
+// Strip HTML tags for description
+const stripHtml = (html) => {
+  if (!html) return "";
+  return html.replace(/<[^>]*>/g, "").trim();
+};
+
+// Truncate text for description
+const truncate = (text, maxLength = 200) => {
+  if (!text || text.length <= maxLength) return text;
+  return text.substring(0, maxLength).trim() + "...";
+};
+
+// Convert date to RFC 822 format for RSS
+const toRfc822 = (date) => {
+  const d = date instanceof Date ? date : new Date(date);
+  return d.toUTCString();
+};
+
+// Generate RSS XML for a set of pages
+const generateRssFeed = (feedConfig, pages, siteUrl) => {
+  const {
+    title = defaultConfig.sitename || "RSS Feed",
+    description = `Latest updates from ${title}`,
+    folder,
+  } = typeof feedConfig === "string" ? { folder: feedConfig } : feedConfig;
+
+  const feedUrl = `${siteUrl}/${folder}/rss.xml`;
+  const feedLink = `${siteUrl}/${folder}`;
+
+  // Sort pages by date (newest first)
+  const sortedPages = [...pages].sort((a, b) => {
+    const dateA = new Date(a.data?.date || a.updated_at || 0);
+    const dateB = new Date(b.data?.date || b.updated_at || 0);
+    return dateB - dateA;
+  });
+
+  // Limit to most recent items (default 20)
+  const maxItems = defaultConfig.rss_max_items || 20;
+  const feedPages = sortedPages.slice(0, maxItems);
+
+  const items = feedPages
+    .map((page) => {
+      const itemUrl = `${siteUrl}${page.url}`;
+      const itemTitle = escapeXml(page.data?.title || page.title || page.name);
+      const itemDate = toRfc822(page.data?.date || page.updated_at || new Date());
+      const itemDescription = escapeXml(
+        truncate(stripHtml(page.content), 300)
+      );
+
+      return `    <item>
+      <title>${itemTitle}</title>
+      <link>${itemUrl}</link>
+      <guid isPermaLink="true">${itemUrl}</guid>
+      <pubDate>${itemDate}</pubDate>
+      <description>${itemDescription}</description>
+    </item>`;
+    })
+    .join("\n");
+
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>${escapeXml(title)}</title>
+    <link>${feedLink}</link>
+    <description>${escapeXml(description)}</description>
+    <language>${defaultConfig.language || "en"}</language>
+    <lastBuildDate>${toRfc822(new Date())}</lastBuildDate>
+    <atom:link href="${feedUrl}" rel="self" type="application/rss+xml"/>
+${items}
+  </channel>
+</rss>`;
+};
+
+// Find pages belonging to a specific folder
+const findPagesInFolder = (pages, folderName) => {
+  const found = [];
+
+  const searchPages = (pageList) => {
+    for (const page of pageList) {
+      // Check if this page's URL starts with the folder path
+      if (page.url && page.url.startsWith(`/${folderName}/`) && !page.folder) {
+        found.push(page);
+      }
+      // Recursively search nested pages
+      if (page.pages) {
+        searchPages(page.pages);
+      }
+    }
+  };
+
+  searchPages(pages);
+  return found;
+};
+
+// Generate all RSS feeds based on config
+const generateRssFeeds = async (pages, outputDir) => {
+  const rssFeeds = defaultConfig.rss_feeds;
+  if (!rssFeeds || !Array.isArray(rssFeeds) || rssFeeds.length === 0) {
+    return;
+  }
+
+  const siteUrl = defaultConfig.site_url || defaultConfig.url || "";
+
+  for (const feedConfig of rssFeeds) {
+    const folder =
+      typeof feedConfig === "string" ? feedConfig : feedConfig.folder;
+
+    if (!folder) {
+      console.warn("RSS feed config missing folder name, skipping");
+      continue;
+    }
+
+    const folderPages = findPagesInFolder(pages, folder);
+
+    if (folderPages.length === 0) {
+      console.warn(`No pages found for RSS feed: ${folder}`);
+      continue;
+    }
+
+    const feedXml = generateRssFeed(feedConfig, folderPages, siteUrl);
+    const feedPath = path.join(outputDir, folder, "rss.xml");
+
+    await fsExtra.ensureDir(path.dirname(feedPath));
+    await fs.writeFile(feedPath, feedXml);
+    console.log(`Generated RSS feed: ${folder}/rss.xml (${folderPages.length} items)`);
+  }
+};
+
+export { generateRssFeeds, generateRssFeed, findPagesInFolder };

package/src/watcher.js

@@ -80,6 +80,8 @@ function getChangeType(filePath) {
 export default async function watch(outDir = "dist") {
   const build = await import("./build.js");
   const { copySingleAsset, optimizeSingleImage } = await import("./assets.js");
+  const { resetCaches } = await import("./layout.js");
+  const { clearCache: clearPartialCache } = await import("./partials.js");
   const watchPaths = getWatchPaths();
 
   if (watchPaths.length === 0) {
@@ -122,9 +124,11 @@ export default async function watch(outDir = "dist") {
       if (event === "deleted") {
         // For deletions, do a full rebuild to clean up
         console.log(`File deleted: ${filename}. Running full build...`);
+        clearPartialCache();
+        await resetCaches();
         await build.default(outDir);
-      } else if (changeType === "css" || changeType === "js") {
-        // Incremental: just copy the changed asset
+      } else if ((changeType === "css" || changeType === "js") && event === "changed") {
+        // Incremental: just copy the changed asset (only for modifications, not additions)
         console.log(`Asset ${event}: ${filename}`);
         await copySingleAsset(filePath, outDir);
       } else if (changeType === "image") {
@@ -132,8 +136,10 @@ export default async function watch(outDir = "dist") {
         console.log(`Image ${event}: ${filename}`);
         await optimizeSingleImage(filePath, outDir);
       } else {
-        // Full rebuild for pages, layouts, partials, config
+        // Full rebuild for pages, layouts, partials, config, and new CSS/JS files
         console.log(`File ${event}: ${filename}. Running full build...`);
+        clearPartialCache();
+        await resetCaches();
         await build.default(outDir);
       }
       // Trigger browser refresh