@jam-comments/astro 2.4.1 → 2.5.0

package/index.d.ts

@@ -7,7 +7,7 @@ declare global {
 }
 
 export interface JamCommentsProps {
-  path: string;
+  path?: string;
   schema?: string | object;
   domain?: string;
   apiKey?: string;
@@ -16,4 +16,4 @@ export interface JamCommentsProps {
   tz?: string;
 }
 
-export default function JamComments({ path }: JamCommentsProps): JSX.Element;
+export default function JamComments(args: JamCommentsProps): JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jam-comments/astro",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "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.",
@@ -11,7 +11,8 @@
   "scripts": {
     "build": "echo 'No build step here...'",
     "format": "prettier --write src",
-    "check": "astro check"
+    "check": "astro check",
+    "test": "vitest run"
   },
   "files": [
     "src",
@@ -45,7 +46,9 @@
   },
   "gitHead": "2b1cefb90c89a2f70099213881b09216f20e3dc2",
   "devDependencies": {
+    "@types/node": "^20.12.12",
     "prettier": "^3.2.5",
-    "prettier-plugin-astro": "^0.13.0"
+    "prettier-plugin-astro": "^0.13.0",
+    "vitest": "^1.6.0"
   }
 }

package/src/component.astro

@@ -2,13 +2,14 @@
 import pkg from "@jam-comments/server-utilities";
 import nodeFetch from "node-fetch";
 import type { JamCommentsProps } from "..";
+import { getCurrentPath } from "./utils";
 const { logError, markupFetcher } = pkg;
 
 type Props = JamCommentsProps;
 
 const fetchMarkup = markupFetcher("astro", nodeFetch as any);
 
-const fetchCommentData = async ({
+async function fetchCommentData({
   tz = undefined,
   path = undefined,
   schema = undefined,
@@ -16,7 +17,7 @@ const fetchCommentData = async ({
   apiKey = import.meta.env.JAM_COMMENTS_API_KEY as string,
   baseUrl = import.meta.env.JAM_COMMENTS_BASE_URL as string,
   environment = import.meta.env.JAM_COMMENTS_ENVIRONMENT as string,
-}: JamCommentsProps) => {
+}: JamCommentsProps) {
   try {
     return await fetchMarkup({
       path,
@@ -31,11 +32,12 @@ const fetchCommentData = async ({
     logError(e as string);
     return null;
   }
-};
+}
 
 const { path, domain, baseUrl, environment, tz, schema } = Astro.props as Props;
+
 const markup = await fetchCommentData({
-  path,
+  path: path || getCurrentPath(Astro),
   schema,
   domain,
   baseUrl,

package/src/utils.test.ts

@@ -0,0 +1,22 @@
+import { expect, it } from "vitest";
+import { getCurrentPath } from "./utils";
+
+it("should return the current path", () => {
+  const astro = {
+    request: {
+      url: "https://example.com/test",
+    },
+  };
+
+  expect(getCurrentPath(astro)).toBe("/test");
+});
+
+it("should ignore query parameters", () => {
+  const astro = {
+    request: {
+      url: "https://example.com/test?query=param",
+    },
+  };
+
+  expect(getCurrentPath(astro)).toBe("/test");
+});

package/src/utils.ts

@@ -0,0 +1,3 @@
+export function getCurrentPath(astro) {
+  return new URL(astro.request.url).pathname;
+}