bunki 0.5.3 → 0.6.1

package/dist/cli.js

@@ -28185,7 +28185,7 @@ function getDefaultConfig() {
   return base;
 }
 async function createDefaultConfig(configPath = DEFAULT_CONFIG_FILE) {
-  if (await configExists()) {
+  if (await configExists(configPath)) {
     console.log(`Config file already exists`);
     return false;
   }
@@ -28243,15 +28243,6 @@ async function processCSS(options2) {
   } catch (error) {
     throw new Error(`CSS input file not found: ${inputPath}`);
   }
-  let postcssConfigExists = false;
-  try {
-    await fs.promises.access(postcssConfigPath);
-    postcssConfigExists = true;
-  } catch (error) {
-    if (verbose) {
-      console.log(`PostCSS config not found at ${postcssConfigPath}, will fallback to simple copy`);
-    }
-  }
   const outputDirPath = path2.dirname(outputPath);
   await fs.promises.mkdir(outputDirPath, { recursive: true });
   if (verbose) {
@@ -28260,71 +28251,33 @@ async function processCSS(options2) {
     console.log(`Output: ${outputPath}`);
     console.log(`Config: ${postcssConfigPath}`);
   }
-  if (!postcssConfigExists) {
-    await fs.promises.copyFile(inputPath, outputPath);
-    if (verbose)
-      console.log("Copied CSS without PostCSS config");
-    return;
-  }
-  const runPostCSS = (configPathToUse) => {
-    return new Promise((resolve, reject) => {
-      const args = ["postcss", inputPath, "-o", outputPath];
-      if (configPathToUse && fs.existsSync(configPathToUse)) {
-        args.push("--config", configPathToUse);
-      }
-      const postcss = spawn("bunx", args, {
-        stdio: verbose ? "inherit" : ["ignore", "pipe", "pipe"],
-        cwd: projectRoot
+  await runPostCSS(inputPath, outputPath, postcssConfigPath, projectRoot, verbose);
+}
+function runPostCSS(inputPath, outputPath, configPath, projectRoot, verbose) {
+  return new Promise((resolve, reject) => {
+    const args = ["postcss", inputPath, "-o", outputPath, "--config", configPath];
+    const postcss = spawn("bunx", args, {
+      stdio: verbose ? "inherit" : ["ignore", "pipe", "pipe"],
+      cwd: projectRoot
+    });
+    let errorOutput = "";
+    if (!verbose) {
+      postcss.stderr?.on("data", (data) => {
+        errorOutput += data.toString();
       });
-      let errorOutput = "";
-      if (!verbose) {
-        postcss.stderr?.on("data", (data) => {
-          errorOutput += data.toString();
-        });
+    }
+    postcss.on("close", (code) => {
+      if (code === 0) {
+        if (verbose)
+          console.log("\u2705 CSS build completed successfully!");
+        return resolve();
       }
-      postcss.on("close", async (code) => {
-        if (code === 0) {
-          if (verbose)
-            console.log("\u2705 CSS build completed successfully!");
-          return resolve();
-        }
-        if (/module is not defined in ES module scope/i.test(errorOutput) && configPathToUse.endsWith(".js")) {
-          const cjsPath = configPathToUse.replace(/\.js$/, ".cjs");
-          try {
-            if (!fs.existsSync(cjsPath)) {
-              const original = await fs.promises.readFile(configPathToUse, "utf-8");
-              await fs.promises.writeFile(cjsPath, original, "utf-8");
-              if (verbose) {
-                console.log(`Retrying PostCSS with converted CommonJS config at ${cjsPath}`);
-              }
-            }
-            return resolve(runPostCSS(cjsPath));
-          } catch (e) {
-            if (verbose)
-              console.warn("CJS fallback failed, copying CSS.");
-            await fs.promises.copyFile(inputPath, outputPath);
-            return resolve();
-          }
-        }
-        if (verbose) {
-          console.warn(`PostCSS failed (code ${code}). Falling back to simple copy. Error: ${errorOutput.trim()}`);
-        }
-        try {
-          await fs.promises.copyFile(inputPath, outputPath);
-          resolve();
-        } catch (copyErr) {
-          reject(new Error(`CSS build failed with code ${code} and fallback copy also failed: ${copyErr.message}`));
-        }
-      });
-      postcss.on("error", (err) => {
-        if (verbose) {
-          console.warn(`Failed to start PostCSS process (${err.message}). Falling back to copy.`);
-        }
-        fs.promises.copyFile(inputPath, outputPath).then(() => resolve()).catch((copyErr) => reject(new Error(`Failed to start PostCSS and fallback copy failed: ${copyErr.message}`)));
-      });
+      reject(new Error(`PostCSS failed with exit code ${code}: ${errorOutput.trim()}`));
     });
-  };
-  await runPostCSS(postcssConfigPath);
+    postcss.on("error", (err) => {
+      reject(new Error(`Failed to start PostCSS: ${err.message}`));
+    });
+  });
 }
 async function watchCSS(options2) {
   const { css, projectRoot, verbose = false } = options2;
@@ -28422,6 +28375,7 @@ import path5 from "path";
 // src/utils/file-utils.ts
 var {Glob } = globalThis.Bun;
 import path4 from "path";
+import { mkdir } from "fs/promises";
 async function findFilesByPattern(pattern, directory, absolute = true) {
   const glob = new Glob(pattern);
   const files = [];
@@ -28434,8 +28388,20 @@ async function findFilesByPattern(pattern, directory, absolute = true) {
   return files;
 }
 async function fileExists(filePath) {
-  const file = Bun.file(filePath);
-  return await file.exists();
+  try {
+    const file = Bun.file(filePath);
+    return await file.exists();
+  } catch {
+    return false;
+  }
+}
+async function isDirectory(dirPath) {
+  try {
+    const stat = await Bun.file(dirPath).stat();
+    return stat?.isDirectory() ?? false;
+  } catch {
+    return false;
+  }
 }
 async function readFileAsText(filePath) {
   try {
@@ -28452,18 +28418,33 @@ async function readFileAsText(filePath) {
 function getBaseFilename(filePath, extension = ".md") {
   return path4.basename(filePath, extension);
 }
-async function ensureDir(dirPath) {
+async function createDir(dirPath) {
   try {
-    await Bun.write(`${dirPath}/.gitkeep`, "");
-  } catch (error) {}
+    await mkdir(dirPath, { recursive: true });
+  } catch (error) {
+    if (await isDirectory(dirPath)) {
+      return;
+    }
+    if (await fileExists(dirPath)) {
+      throw new Error(`Path exists but is not a directory: ${dirPath}`);
+    }
+    console.error(`Error creating directory ${dirPath}:`, error);
+    throw error;
+  }
+}
+async function ensureDir(dirPath) {
+  return createDir(dirPath);
 }
 async function copyFile(sourcePath, targetPath) {
   try {
     const sourceFile = Bun.file(sourcePath);
-    const content = await sourceFile.arrayBuffer();
-    await Bun.write(targetPath, content);
+    if (!await sourceFile.exists()) {
+      throw new Error(`Source file does not exist: ${sourcePath}`);
+    }
+    await Bun.write(targetPath, sourceFile);
   } catch (error) {
     console.error(`Error copying file from ${sourcePath} to ${targetPath}:`, error);
+    throw error;
   }
 }
 
@@ -33263,29 +33244,85 @@ class SiteGenerator {
       console.log("Copied public files to site (including extensionless & dotfiles)");
     }
   }
+  extractFirstImageUrl(html) {
+    const imgRegex = /<img[^>]+src=["']([^"']+)["']/;
+    const match = html.match(imgRegex);
+    return match ? match[1] : null;
+  }
+  escapeXml(text) {
+    return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+  }
   async generateRSSFeed() {
     const posts = this.site.posts.slice(0, 15);
     const config = this.options.config;
+    const now = this.getPacificDate(new Date);
+    const latestPostDate = posts.length > 0 ? posts[0].date : now.toISOString();
+    const lastBuildDate = this.formatRSSDate(latestPostDate);
     const rssItems = posts.map((post) => {
       const postUrl = `${config.baseUrl}${post.url}`;
       const pubDate = this.formatRSSDate(post.date);
-      return `    <item>
+      const featuredImage = this.extractFirstImageUrl(post.html);
+      const categoryTags = post.tags.map((tag) => `      <category>${this.escapeXml(tag)}</category>`).join(`
+`);
+      let itemXml = `    <item>
       <title><![CDATA[${post.title}]]></title>
       <link>${postUrl}</link>
-      <guid>${postUrl}</guid>
-      <pubDate>${pubDate}</pubDate>
-      <description><![CDATA[${post.excerpt}]]></description>
+      <guid isPermaLink="true">${postUrl}</guid>
+      <pubDate>${pubDate}</pubDate>`;
+      if (config.authorEmail && config.authorName) {
+        itemXml += `
+      <author>${config.authorEmail} (${config.authorName})</author>`;
+      } else if (config.authorEmail) {
+        itemXml += `
+      <author>${config.authorEmail}</author>`;
+      }
+      itemXml += `
+      <description><![CDATA[${post.excerpt}]]></description>`;
+      if (post.tags.length > 0) {
+        itemXml += `
+${categoryTags}`;
+      }
+      itemXml += `
+      <content:encoded><![CDATA[${post.html}]]></content:encoded>`;
+      if (featuredImage) {
+        const absoluteImageUrl = featuredImage.startsWith("http") ? featuredImage : `${config.baseUrl}${featuredImage}`;
+        itemXml += `
+      <media:thumbnail url="${this.escapeXml(absoluteImageUrl)}" />`;
+      }
+      itemXml += `
     </item>`;
+      return itemXml;
     }).join(`
 `);
-    const rssContent = `<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-  <channel>
+    let channelXml = `  <channel>
     <title><![CDATA[${config.title}]]></title>
-    <description><![CDATA[${config.description}]]></description>
     <link>${config.baseUrl}</link>
-    <atom:link href="${config.baseUrl}/feed.xml" rel="self" type="application/rss+xml" />
-    <lastBuildDate>${this.formatRSSDate(this.getPacificDate(new Date).toISOString())}</lastBuildDate>
+    <description><![CDATA[${config.description}]]></description>`;
+    const language = config.rssLanguage || "en-US";
+    channelXml += `
+    <language>${language}</language>`;
+    if (config.authorEmail && config.authorName) {
+      channelXml += `
+    <managingEditor>${config.authorEmail} (${config.authorName})</managingEditor>`;
+    } else if (config.authorEmail) {
+      channelXml += `
+    <managingEditor>${config.authorEmail}</managingEditor>`;
+    }
+    if (config.webMaster) {
+      channelXml += `
+    <webMaster>${config.webMaster}</webMaster>`;
+    }
+    if (config.copyright) {
+      channelXml += `
+    <copyright><![CDATA[${config.copyright}]]></copyright>`;
+    }
+    channelXml += `
+    <pubDate>${this.formatRSSDate(latestPostDate)}</pubDate>
+    <lastBuildDate>${lastBuildDate}</lastBuildDate>
+    <atom:link href="${config.baseUrl}/feed.xml" rel="self" type="application/rss+xml" />`;
+    const rssContent = `<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:media="http://search.yahoo.com/mrss/">
+${channelXml}
 ${rssItems}
   </channel>
 </rss>`;
@@ -33476,7 +33513,12 @@ async function handleGenerateCommand(options2, deps = defaultDeps2) {
     deps.logger.log(`- Output directory: ${outputDir}`);
     deps.logger.log(`- Templates directory: ${templatesDir}`);
     const config = await deps.loadConfig(configPath);
-    const generator = deps.createGenerator({ contentDir, outputDir, templatesDir, config });
+    const generator = deps.createGenerator({
+      contentDir,
+      outputDir,
+      templatesDir,
+      config
+    });
     await generator.initialize();
     await generator.generate();
     deps.logger.log("Site generation completed successfully!");
@@ -34191,56 +34233,56 @@ function getDefaultCss() {
 }
 function getSamplePost() {
   return `---
-  title: Welcome to Bunki
-  date: ${new Date().toISOString()}
-  tags: [getting-started, bunki]
-  ---
+title: Welcome to Bunki
+date: ${new Date().toISOString()}
+tags: [getting-started, bunki]
+---
 
-  # Welcome to Your New Bunki Site
+# Welcome to Your New Bunki Site
 
-  This is a sample blog post to help you get started with Bunki. You can edit this file or create new markdown files in the \`content\` directory.
+This is a sample blog post to help you get started with Bunki. You can edit this file or create new markdown files in the \`content\` directory.
 
-  ## Features
+## Features
 
-  - Markdown support with frontmatter
-  - Syntax highlighting for code blocks
-  - Tag-based organization
-  - Pagination for post listings
-  - RSS feed generation
-  - Sitemap generation
+- Markdown support with frontmatter
+- Syntax highlighting for code blocks
+- Tag-based organization
+- Pagination for post listings
+- RSS feed generation
+- Sitemap generation
 
-  ## Adding Content
+## Adding Content
 
-  Create new markdown files in the \`content\` directory with frontmatter like this:
+Create new markdown files in the \`content\` directory with frontmatter like this:
 
-  \`\`\`markdown
-  ---
-  title: Your Post Title
-  date: 2025-01-01T12:00:00Z
-  tags: [tag1, tag2]
-  ---
+\`\`\`markdown
+---
+title: Your Post Title
+date: 2025-01-01T12:00:00Z
+tags: [tag1, tag2]
+---
 
-  Your post content goes here...
-  \`\`\`
+Your post content goes here...
+\`\`\`
 
-  ## Code Highlighting
+## Code Highlighting
 
-  Bunki supports syntax highlighting for code blocks:
+Bunki supports syntax highlighting for code blocks:
 
-  \`\`\`javascript
-  function hello() {
-    console.log('Hello, world!');
-  }
-  \`\`\`
+\`\`\`javascript
+function hello() {
+  console.log('Hello, world!');
+}
+\`\`\`
 
-  ## Next Steps
+## Next Steps
 
-  1. Edit the site configuration in \`bunki.config.ts\`
-  2. Create your own templates in the \`templates\` directory
-  3. Add more blog posts in the \`content\` directory
-  4. Run \`bunki generate\` to build your site
-  5. Run \`bunki serve\` to preview your site locally
-  `;
+1. Edit the site configuration in \`bunki.config.ts\`
+2. Create your own templates in the \`templates\` directory
+3. Add more blog posts in the \`content\` directory
+4. Run \`bunki generate\` to build your site
+5. Run \`bunki serve\` to preview your site locally
+`;
 }
 
 // src/cli/commands/new-post.ts
@@ -34440,6 +34482,8 @@ registerServeCommand(program2);
 registerCssCommand(program2);
 registerImagesPushCommand(program2);
 program2.name("bunki").description("An opinionated static site generator built with Bun").version("0.5.3");
-if (import.meta.url === Bun.main) {
+var currentFile = import.meta.url.replace("file://", "");
+var mainFile = Bun.main;
+if (currentFile === mainFile || currentFile.endsWith(mainFile)) {
   program2.parse(Bun.argv);
 }