@jam-comments/astro 2.6.0 → 2.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jam-comments/astro",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "author": "Alex MacArthur <alex@macarthur.me> (https://macarthur.me)",
   "license": "GPL-2.0",
   "description": "Easily add performant, SEO-friendly comments to your Astro blog with JamComments.",
@@ -40,7 +40,7 @@
   "dependencies": {
     "@astrojs/check": "^0.8.2",
     "@jam-comments/server-utilities": "^5.2.0",
-    "astro": "^4.11.6",
+    "astro": "^4.12.2",
     "node-fetch": "^3.3.2",
     "typescript": "^5.5.3"
   },

package/src/component.astro

@@ -2,7 +2,7 @@
 import pkg from "@jam-comments/server-utilities";
 import nodeFetch from "node-fetch";
 import type { JamCommentsProps } from "..";
-import { getCurrentPath } from "./utils";
+import { getCurrentPath, removeFalseyValues } from "./utils";
 const { logError, markupFetcher } = pkg;
 
 type Props = JamCommentsProps;
@@ -28,17 +28,17 @@ async function fetchCommentData({
       baseUrl,
       environment,
       tz,
-      copy: {
+      copy: removeFalseyValues({
         copy_confirmation_message: copy.confirmationMessage,
         copy_submit_button: copy.submitButton,
-        copy_name_placeholder: copy.submitButton,
-        copy_email_placeholder: copy.submitButton,
-        copy_comment_placeholder: copy.submitButton,
-        copy_write_tab: copy.submitButton,
-        copy_preview_tab: copy.submitButton,
-        copy_auth_button: copy.submitButton,
-        copy_log_out_button: copy.submitButton,
-      },
+        copy_name_placeholder: copy.namePlaceholder,
+        copy_email_placeholder: copy.emailPlaceholder,
+        copy_comment_placeholder: copy.commentPlaceholder,
+        copy_write_tab: copy.writeTab,
+        copy_preview_tab: copy.previewTab,
+        copy_auth_button: copy.authButton,
+        copy_log_out_button: copy.logOutButton,
+      }),
     });
   } catch (e) {
     logError(e as string);

package/src/utils.test.ts

@@ -1,23 +1,48 @@
-import { expect, it } from "vitest";
-import { getCurrentPath } from "./utils";
+import { describe, expect, it } from "vitest";
+import { getCurrentPath, removeFalseyValues } from "./utils";
 import { AstroGlobal } from "astro";
 
-it("should return the current path", () => {
-  const astro = {
-    request: {
-      url: "https://example.com/test",
-    },
-  } as AstroGlobal;
+describe("getCurrentPath()", () => {
+  it("should return the current path", () => {
+    const astro = {
+      request: {
+        url: "https://example.com/test",
+      },
+    } as AstroGlobal;
 
-  expect(getCurrentPath(astro)).toBe("/test");
+    expect(getCurrentPath(astro)).toBe("/test");
+  });
+
+  it("should ignore query parameters", () => {
+    const astro = {
+      request: {
+        url: "https://example.com/test?query=param",
+      },
+    } as AstroGlobal;
+
+    expect(getCurrentPath(astro)).toBe("/test");
+  });
 });
 
-it("should ignore query parameters", () => {
-  const astro = {
-    request: {
-      url: "https://example.com/test?query=param",
-    },
-  } as AstroGlobal;
+describe("removeFalseyValues()", () => {
+  it("should remove falsey values", () => {
+    expect(removeFalseyValues({ a: 1, b: 0, d: null, e: "" })).toEqual({
+      a: 1,
+    });
+  });
+
+  it("should remove undefined items", () => {
+    const customCopy = {
+      copy_confirmation_message: "Thank you for your comment!",
+      copy_submit_button: "Submit",
+      copy_name_placeholder: undefined,
+    };
+
+    const result = removeFalseyValues(customCopy);
 
-  expect(getCurrentPath(astro)).toBe("/test");
+    expect(result).toEqual({
+      copy_confirmation_message: "Thank you for your comment!",
+      copy_submit_button: "Submit",
+    });
+  });
 });

package/src/utils.ts

@@ -3,3 +3,9 @@ import { AstroGlobal } from "astro";
 export function getCurrentPath(astro: AstroGlobal) {
   return new URL(astro.request.url).pathname;
 }
+
+export function removeFalseyValues<T>(obj: T): Partial<T> {
+  const filteredItems = Object.entries(obj).filter(([, value]) => value);
+
+  return Object.fromEntries(filteredItems) as Partial<T>;
+}