cleanup: small changes and new description

Author: GabsEdits

README.md

@@ -4,7 +4,7 @@
     <source media="(prefers-color-scheme: light)" srcset="https://github.com/user-attachments/assets/c76ceb71-6ad5-49a8-89df-5084d7a713ba">
     <img alt="Feed logo" src="https://github.com/user-attachments/assets/c76ceb71-6ad5-49a8-89df-5084d7a713ba" width="220">
   </picture>
-<p>A modern, fast, and easy-to-use RSS and Atom feed generator for Deno.
+<p>A modern, fast, and easy-to-use RSS, JSON and Atom feed generator for Deno.
 <br><small>Replacement for <a href="https://npmjs.com/package/feed">feed</a> package.</small></p>
 </div>
 

src/atom.ts

@@ -29,14 +29,14 @@ export class AtomFeed extends BaseFeed<AtomEntry> {
       `  <generator>${this.options.generator || "Feed for Deno"}</generator>\n`,
     ];
 
-    this.options.authors.forEach((author) => {
+    for (const author of this.options.authors) {
       xmlParts.push(
         `  <author>\n`,
         `    <name>${escapeXml(author.name)}</name>\n`,
         `    <email>${escapeXml(author.email)}</email>\n`,
         `  </author>\n`,
       );
-    });
+    }
 
     if (this.options.icon) {
       xmlParts.push(`  <icon>${escapeXml(this.options.icon)}</icon>\n`);
@@ -49,7 +49,7 @@ export class AtomFeed extends BaseFeed<AtomEntry> {
       );
     }
 
-    this.items.forEach((entry) => {
+    for (const entry of this.items) {
       xmlParts.push(
         `  <entry>\n`,
         `    <title>${escapeXml(entry.title)}</title>\n`,
@@ -65,11 +65,11 @@ export class AtomFeed extends BaseFeed<AtomEntry> {
           : "",
         `  </entry>\n`,
       );
-    });
+    }
 
-    this.categories.forEach((category) => {
+    for (const category of this.categories) {
       xmlParts.push(`  <category term="${escapeXml(category)}"/>\n`);
-    });
+    }
 
     xmlParts.push(`</feed>\n`);
     return xmlParts.join("");

src/common.ts

@@ -20,36 +20,28 @@ export interface FeedOptions {
 }
 
 export function escapeXml(unsafe: string): string {
-  return unsafe.replace(/[<>&'"]/g, (c) => {
-    switch (c) {
-      case "<":
-        return "&lt;";
-      case ">":
-        return "&gt;";
-      case "&":
-        return "&amp;";
-      case "'":
-        return "&apos;";
-      case '"':
-        return "&quot;";
-      default:
-        return c;
-    }
-  });
+  const escapeMap: { [key: string]: string } = {
+    "<": "&lt;",
+    ">": "&gt;",
+    "&": "&amp;",
+    "'": "&apos;",
+    '"': "&quot;",
+  };
+  return unsafe.replace(/[<>&'"]/g, (c) => escapeMap[c] || c);
 }
 
 export abstract class BaseFeed<T> {
   protected options: FeedOptions;
   protected items: Array<T>;
-  protected categories: Array<string>;
+  protected categories: Set<string>;
 
   constructor(options: FeedOptions) {
     this.options = {
       ...options,
       updated: options.updated || new Date(),
     };
     this.items = [];
-    this.categories = [];
+    this.categories = new Set();
   }
 
   abstract build(): string;
@@ -59,7 +51,7 @@ export abstract class BaseFeed<T> {
   }
 
   addCategory(category: string) {
-    this.categories.push(category);
+    this.categories.add(category);
   }
 
   addContributor(contributor: { name: string; email: string; link?: string }) {

src/json.ts

@@ -21,18 +21,15 @@ export class JsonFeed extends BaseFeed<JsonItem> {
       feed_url: this.options.feed,
       icon: this.options.icon,
       updated: this.options.updated?.toISOString(),
-      items: this.items.map((item) => {
-        const jsonItem: Record<string, unknown> = {
-          id: item.id,
-          title: item.title,
-          url: item.url,
-          date_published: item.date_published.toISOString(),
-        };
-        if (item.content_html) {
-          jsonItem.content_html = item.content_html;
-        }
-        return jsonItem;
-      }),
+      items: this.items.map((
+        { id, title, url, date_published, content_html },
+      ) => ({
+        id,
+        title,
+        url,
+        date_published: date_published.toISOString(),
+        ...(content_html && { content_html }),
+      })),
     };
     return JSON.stringify(json, null, 2);
   }

src/rss.ts

@@ -28,44 +28,41 @@ export class RssFeed extends BaseFeed<RssItem> {
       `    <lastBuildDate>${this.options.updated?.toUTCString()}</lastBuildDate>\n`,
       `    <language>${this.options.language || "en"}</language>\n`,
       `    <generator>${
-        this.options.generator || "Feed for Deno"
+        escapeXml(this.options.generator || "Feed for Deno")
       }</generator>\n`,
     ];
 
-    this.options.authors.forEach((author) => {
-      xmlParts.push(
-        `    <webMaster>${escapeXml(author.email)} (${
-          escapeXml(author.name)
-        })</webMaster>\n`,
-        `    <author>${escapeXml(author.email)} (${
-          escapeXml(author.name)
-        })</author>\n`,
-        `    <managingEditor>${escapeXml(author.email)} (${
-          escapeXml(author.name)
-        })</managingEditor>\n`,
-      );
-    });
+    const authorXml = this.options.authors.map((author) =>
+      `    <webMaster>${escapeXml(author.email)} (${
+        escapeXml(author.name)
+      })</webMaster>\n` +
+      `    <author>${escapeXml(author.email)} (${
+        escapeXml(author.name)
+      })</author>\n` +
+      `    <managingEditor>${escapeXml(author.email)} (${
+        escapeXml(author.name)
+      })</managingEditor>\n`
+    ).join("");
+    xmlParts.push(authorXml);
 
-    this.items.forEach((item) => {
-      const itemParts: string[] = [
-        `    <item>\n`,
-        `      <title>${escapeXml(item.title)}</title>\n`,
-        `      <link>${escapeXml(item.link)}</link>\n`,
-        `      <guid>${escapeXml(item.id)}</guid>\n`,
-        `      <pubDate>${item.updated.toUTCString()}</pubDate>\n`,
-        `      <description>${escapeXml(item.description)}</description>\n`,
-      ];
-      if (item.content) {
-        const contentType = item.content.type || "text";
-        itemParts.push(
-          `      <content:encoded type="${contentType}">${
-            escapeXml(item.content.body)
-          }</content:encoded>\n`,
-        );
-      }
-      itemParts.push(`    </item>\n`);
-      xmlParts.push(...itemParts);
-    });
+    const itemsXml = this.items.map((item) => {
+      const contentXml = item.content
+        ? `      <content:encoded type="${
+          escapeXml(item.content.type || "text")
+        }">${escapeXml(item.content.body)}</content:encoded>\n`
+        : "";
+      return (
+        `    <item>\n` +
+        `      <title>${escapeXml(item.title)}</title>\n` +
+        `      <link>${escapeXml(item.link)}</link>\n` +
+        `      <guid>${escapeXml(item.id)}</guid>\n` +
+        `      <pubDate>${item.updated.toUTCString()}</pubDate>\n` +
+        `      <description>${escapeXml(item.description)}</description>\n` +
+        contentXml +
+        `    </item>\n`
+      );
+    }).join("");
+    xmlParts.push(itemsXml);
 
     xmlParts.push(`  </channel>\n`, `</rss>\n`);
     return xmlParts.join("");