@jamwidgets/astro 0.5.1 → 0.6.3

package/README.md

@@ -11,6 +11,18 @@ Astro components and content loader for [Jamwidgets](https://jamwidgets.com) - w
 npm install @jamwidgets/astro
 ```
 
+## Galleries
+
+```astro
+---
+import GalleryIndex from "@jamwidgets/astro/GalleryIndex";
+import Gallery from "@jamwidgets/astro/Gallery";
+---
+
+<GalleryIndex siteKey="your-key" deepLink />
+<Gallery siteKey="your-key" slug="field-notes" tag="portraits" />
+```
+
 ## Setup
 
 Add your Jamwidgets site key to your `.env`:

package/dist/index.d.ts

@@ -5,7 +5,8 @@
  * Re-exports all types, API functions, and controllers from @jamwidgets/core.
  */
 export { DEFAULT_ENDPOINT, API_PATH, VISITOR_STORAGE_KEY, type JamwidgetsConfig, type SeriphConfig, // deprecated alias
-type Comment, type ReactionCounts, type FormSubmitResponse, type SubscribeResponse, type JamwidgetsPost, type SeriphPost, // deprecated alias
-type Announcement, type AnnouncementType, type Poll, type PollOption, type PollSettings, type PollWithResults, type ShowResultsMode, type FeedbackType, buildUrl, getSiteKey, getVisitorId, setVisitorId, type SubmitFormOptions, submitForm, type FetchCommentsOptions, fetchComments, type PostCommentOptions, postComment, type FetchReactionsOptions, type FetchReactionsResponse, fetchReactions, type AddReactionOptions, addReaction, type RemoveReactionOptions, removeReaction, type SubscribeOptions, subscribe, type JoinWaitlistOptions, type JoinWaitlistResponse, joinWaitlist, type ViewCountsOptions, type ViewCounts, type RecordViewResponse, getViewCounts, recordView, type SubmitFeedbackOptions, type SubmitFeedbackResponse, submitFeedback, type FetchPollOptions, fetchPoll, type VotePollOptions, type VotePollResponse, votePoll, type FetchAnnouncementsOptions, fetchAnnouncements, type DismissAnnouncementOptions, dismissAnnouncement, type FetchPostsOptions, fetchPosts, type FetchPostOptions, fetchPost, type SiteConfig, fetchSiteConfig, POWERED_BY_URL, POWERED_BY_LABEL, type ControllerStatus, type ControllerListener, type SubscribeState, type FormState, type ReactionsState, type CommentsState, type WaitlistState, type ViewCountsState, type FeedbackState, type PollState, type AnnouncementsState, SubscribeController, WaitlistController, FormController, ReactionsController, CommentsController, ViewCountsController, FeedbackController, PollController, AnnouncementsController, } from "@jamwidgets/core";
+type Comment, type ReactionCounts, type FormSubmitResponse, type SubscribeResponse, type JamwidgetsPost, type JamwidgetsGallery, type GalleryPhoto, type GallerySummary, type SeriphPost, // deprecated alias
+type Announcement, type AnnouncementType, type Poll, type PollOption, type PollSettings, type PollWithResults, type ShowResultsMode, type FeedbackType, buildUrl, getSiteKey, getVisitorId, setVisitorId, type SubmitFormOptions, submitForm, type FetchCommentsOptions, fetchComments, type PostCommentOptions, postComment, type FetchReactionsOptions, type FetchReactionsResponse, fetchReactions, type AddReactionOptions, addReaction, type RemoveReactionOptions, removeReaction, type SubscribeOptions, subscribe, type JoinWaitlistOptions, type JoinWaitlistResponse, joinWaitlist, type ViewCountsOptions, type ViewCounts, type RecordViewResponse, getViewCounts, recordView, type SubmitFeedbackOptions, type SubmitFeedbackResponse, submitFeedback, type FetchPollOptions, fetchPoll, type VotePollOptions, type VotePollResponse, votePoll, type FetchAnnouncementsOptions, fetchAnnouncements, type DismissAnnouncementOptions, dismissAnnouncement, type FetchPostsOptions, fetchPosts, type FetchPostOptions, fetchPost, type FetchGalleriesOptions, fetchGalleries, type FetchGalleryOptions, fetchGallery, type FetchRandomPhotoOptions, fetchRandomPhoto, type SiteConfig, fetchSiteConfig, POWERED_BY_URL, POWERED_BY_LABEL, type ControllerStatus, type ControllerListener, type SubscribeState, type FormState, type ReactionsState, type CommentsState, type WaitlistState, type ViewCountsState, type FeedbackState, type PollState, type AnnouncementsState, SubscribeController, WaitlistController, FormController, ReactionsController, CommentsController, ViewCountsController, FeedbackController, PollController, AnnouncementsController, } from "@jamwidgets/core";
 export { jamwidgetsPostsLoader, seriphPostsLoader, // deprecated alias
-type JamwidgetsPostsLoaderOptions, type SeriphPostsLoaderOptions, } from "./loader.js";
+type JamwidgetsPostsLoaderOptions, type SeriphPostsLoaderOptions, // deprecated alias
+jamwidgetsGalleriesLoader, type JamwidgetsGalleriesLoaderOptions, } from "./loader.js";

package/dist/index.js

@@ -9,7 +9,7 @@ export {
 // Constants
 DEFAULT_ENDPOINT, API_PATH, VISITOR_STORAGE_KEY, 
 // Helpers
-buildUrl, getSiteKey, getVisitorId, setVisitorId, submitForm, fetchComments, postComment, fetchReactions, addReaction, removeReaction, subscribe, joinWaitlist, getViewCounts, recordView, submitFeedback, fetchPoll, votePoll, fetchAnnouncements, dismissAnnouncement, fetchPosts, fetchPost, fetchSiteConfig, POWERED_BY_URL, POWERED_BY_LABEL, SubscribeController, WaitlistController, FormController, ReactionsController, CommentsController, ViewCountsController, FeedbackController, PollController, AnnouncementsController, } from "@jamwidgets/core";
+buildUrl, getSiteKey, getVisitorId, setVisitorId, submitForm, fetchComments, postComment, fetchReactions, addReaction, removeReaction, subscribe, joinWaitlist, getViewCounts, recordView, submitFeedback, fetchPoll, votePoll, fetchAnnouncements, dismissAnnouncement, fetchPosts, fetchPost, fetchGalleries, fetchGallery, fetchRandomPhoto, fetchSiteConfig, POWERED_BY_URL, POWERED_BY_LABEL, SubscribeController, WaitlistController, FormController, ReactionsController, CommentsController, ViewCountsController, FeedbackController, PollController, AnnouncementsController, } from "@jamwidgets/core";
 // Re-export loader (Astro-specific)
 export { jamwidgetsPostsLoader, seriphPostsLoader, // deprecated alias
- } from "./loader.js";
+jamwidgetsGalleriesLoader, } from "./loader.js";

package/dist/loader.d.ts

@@ -45,3 +45,10 @@ export type SeriphPostsLoaderOptions = JamwidgetsPostsLoaderOptions;
 export declare function jamwidgetsPostsLoader(options: JamwidgetsPostsLoaderOptions): Loader;
 /** @deprecated Use jamwidgetsPostsLoader instead */
 export declare const seriphPostsLoader: typeof jamwidgetsPostsLoader;
+export interface JamwidgetsGalleriesLoaderOptions {
+    siteKey: string;
+    endpoint?: string;
+    origin?: string;
+    onError?: "throw" | "warn" | "ignore";
+}
+export declare function jamwidgetsGalleriesLoader(options: JamwidgetsGalleriesLoaderOptions): Loader;

package/dist/loader.js

@@ -16,7 +16,7 @@
  *
  * export const collections = { posts };
  */
-import { DEFAULT_ENDPOINT, API_PATH, getSiteKey, fetchPosts as coreFetchPosts, fetchPost as coreFetchPost, } from "@jamwidgets/core";
+import { DEFAULT_ENDPOINT, API_PATH, getSiteKey, fetchPosts as coreFetchPosts, fetchPost as coreFetchPost, fetchGalleries as coreFetchGalleries, fetchGallery as coreFetchGallery, } from "@jamwidgets/core";
 export { coreFetchPosts as fetchPosts, coreFetchPost as fetchPost };
 /**
  * Creates an Astro content loader that fetches posts from Jamwidgets.
@@ -77,3 +77,43 @@ export function jamwidgetsPostsLoader(options) {
 }
 /** @deprecated Use jamwidgetsPostsLoader instead */
 export const seriphPostsLoader = jamwidgetsPostsLoader;
+export function jamwidgetsGalleriesLoader(options) {
+    const { endpoint = DEFAULT_ENDPOINT, origin, onError = "throw" } = options;
+    const siteKey = getSiteKey({ siteKey: options.siteKey });
+    return {
+        name: "jamwidgets-galleries-loader",
+        async load({ store, logger }) {
+            try {
+                const summaries = [];
+                let after;
+                do {
+                    const page = await coreFetchGalleries({
+                        siteKey,
+                        endpoint,
+                        origin,
+                        limit: 100,
+                        after,
+                    });
+                    summaries.push(...page.galleries);
+                    after = page.nextCursor;
+                } while (after);
+                const galleries = [];
+                for (const summary of summaries) {
+                    galleries.push(await coreFetchGallery({ siteKey, endpoint, origin, slug: summary.slug }));
+                }
+                const entries = galleries.filter((gallery) => gallery !== null);
+                store.clear();
+                for (const gallery of entries)
+                    store.set({ id: gallery.slug, data: { ...gallery } });
+                logger.info(`Loaded ${entries.length} galleries from Jamwidgets at build time`);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                if (onError === "throw")
+                    throw error;
+                if (onError === "warn")
+                    logger.warn(`Error loading galleries: ${message}`);
+            }
+        },
+    };
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jamwidgets/astro",
-  "version": "0.5.1",
-  "description": "Astro components and content loader for Jamwidgets (forms, comments, reactions, posts)",
+  "version": "0.6.3",
+  "description": "Astro components and content loaders for Jamwidgets",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/jamwidgets/astro.git"
@@ -33,7 +33,10 @@
     "./Announcements": "./src/Announcements.astro",
     "./Feedback": "./src/Feedback.astro",
     "./Waitlist": "./src/Waitlist.astro",
-    "./Embed": "./src/Embed.astro"
+    "./Embed": "./src/Embed.astro",
+    "./Gallery": "./src/Gallery.astro",
+    "./GalleryIndex": "./src/GalleryIndex.astro",
+    "./RandomPhoto": "./src/RandomPhoto.astro"
   },
   "files": [
     "src",
@@ -57,7 +60,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@jamwidgets/core": "^0.4.0"
+    "@jamwidgets/core": "^0.5.2"
   },
   "peerDependencies": {
     "astro": "^5.9.0 || ^6.0.0 || ^7.0.0"

package/src/Announcements.astro

@@ -89,6 +89,16 @@ import Theme from "./Theme.astro";
       }
     }
 
+    function safeLinkUrl(value?: string): string | null {
+      if (!value) return null;
+      try {
+        const url = new URL(value, window.location.href);
+        return url.protocol === "http:" || url.protocol === "https:" ? url.href : null;
+      } catch {
+        return null;
+      }
+    }
+
     function renderAnnouncements(announcements: Announcement[]) {
       container.innerHTML = "";
 
@@ -97,25 +107,31 @@ import Theme from "./Theme.astro";
         el.className = `jamwidgets-announcement jamwidgets-announcement-${announcement.announcementType}`;
         el.dataset.announcementId = announcement.id;
 
-        let content = `<span class="jamwidgets-announcement-content">${announcement.content}</span>`;
-
-        if (announcement.linkUrl) {
-          content += ` <a href="${announcement.linkUrl}" class="jamwidgets-announcement-link">${announcement.linkText || "Learn more"}</a>`;
+        const contentEl = document.createElement("span");
+        contentEl.className = "jamwidgets-announcement-content";
+        contentEl.textContent = announcement.content;
+        el.append(contentEl);
+
+        const linkUrl = safeLinkUrl(announcement.linkUrl);
+        if (linkUrl) {
+          const link = document.createElement("a");
+          link.className = "jamwidgets-announcement-link";
+          link.href = linkUrl;
+          link.textContent = announcement.linkText || "Learn more";
+          el.append(" ", link);
         }
 
         if (announcement.isDismissible) {
-          content += `
+          el.insertAdjacentHTML("beforeend", `
             <button type="button" class="jamwidgets-announcement-dismiss" aria-label="Dismiss">
               <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
                 <line x1="18" y1="6" x2="6" y2="18"></line>
                 <line x1="6" y1="6" x2="18" y2="18"></line>
               </svg>
             </button>
-          `;
+          `);
         }
 
-        el.innerHTML = content;
-
         // Handle dismiss
         const dismissBtn = el.querySelector(".jamwidgets-announcement-dismiss");
         dismissBtn?.addEventListener("click", async () => {

package/src/Embed.astro

@@ -188,11 +188,13 @@ import Theme from "./Theme.astro";
             const inputType = poll!.settings.multiSelect ? "checkbox" : "radio";
             optionEl.innerHTML = `
               <label class="jamwidgets-poll-label ${isSelected ? "jamwidgets-selected" : ""}">
-                <input type="${inputType}" name="poll-${poll!.id}" value="${option.id}" ${isSelected ? "checked" : ""} />
-                <span class="jamwidgets-poll-text">${option.text}</span>
+                <input type="${inputType}" ${isSelected ? "checked" : ""} />
+                <span class="jamwidgets-poll-text"></span>
               </label>
             `;
             const input = optionEl.querySelector("input")!;
+            input.name = `poll-${poll!.id}`;
+            input.value = option.id;
             input.addEventListener("change", () => {
               if (poll!.settings.multiSelect) {
                 if (input.checked) {
@@ -215,7 +217,7 @@ import Theme from "./Theme.astro";
             optionEl.innerHTML = `
               <div class="jamwidgets-poll-result ${isSelected ? "jamwidgets-voted" : ""}">
                 <div class="jamwidgets-poll-bar" style="width: ${percent}%"></div>
-                <span class="jamwidgets-poll-text">${option.text}</span>
+                <span class="jamwidgets-poll-text"></span>
                 <span class="jamwidgets-poll-percent">${percent}%</span>
               </div>
             `;
@@ -223,10 +225,11 @@ import Theme from "./Theme.astro";
             // Show without results (voted but results hidden)
             optionEl.innerHTML = `
               <div class="jamwidgets-poll-result jamwidgets-no-results ${isSelected ? "jamwidgets-voted" : ""}">
-                <span class="jamwidgets-poll-text">${option.text}</span>
+                <span class="jamwidgets-poll-text"></span>
               </div>
             `;
           }
+          optionEl.querySelector(".jamwidgets-poll-text")!.textContent = option.text;
           optionsEl.appendChild(optionEl);
         });
 

package/src/Gallery.astro

@@ -0,0 +1,8 @@
+---
+interface Props { siteKey: string; slug: string; endpoint?: string; tag?: string }
+const { siteKey, slug, endpoint, tag } = Astro.props;
+---
+<jamwidgets-gallery site-key={siteKey} slug={slug} endpoint={endpoint} tag={tag} />
+<script>
+  import "@jamwidgets/core/gallery-elements";
+</script>

package/src/GalleryIndex.astro

@@ -0,0 +1,8 @@
+---
+interface Props { siteKey: string; endpoint?: string; deepLink?: boolean }
+const { siteKey, endpoint, deepLink = false } = Astro.props;
+---
+<jamwidgets-gallery-index site-key={siteKey} endpoint={endpoint} deep-link={deepLink ? "" : undefined} />
+<script>
+  import "@jamwidgets/core/gallery-elements";
+</script>

package/src/Poll.astro

@@ -172,11 +172,13 @@ import Theme from "./Theme.astro";
           const inputType = poll!.settings.multiSelect ? "checkbox" : "radio";
           optionEl.innerHTML = `
             <label class="jamwidgets-poll-label ${isSelected ? "jamwidgets-selected" : ""}">
-              <input type="${inputType}" name="poll-${poll!.id}" value="${option.id}" ${isSelected ? "checked" : ""} />
-              <span class="jamwidgets-poll-text">${option.text}</span>
+              <input type="${inputType}" ${isSelected ? "checked" : ""} />
+              <span class="jamwidgets-poll-text"></span>
             </label>
           `;
           const input = optionEl.querySelector("input")!;
+          input.name = `poll-${poll!.id}`;
+          input.value = option.id;
           input.addEventListener("change", () => {
             if (poll!.settings.multiSelect) {
               if (input.checked) {
@@ -199,7 +201,7 @@ import Theme from "./Theme.astro";
           optionEl.innerHTML = `
             <div class="jamwidgets-poll-result ${isSelected ? "jamwidgets-voted" : ""}">
               <div class="jamwidgets-poll-bar" style="width: ${percent}%"></div>
-              <span class="jamwidgets-poll-text">${option.text}</span>
+              <span class="jamwidgets-poll-text"></span>
               <span class="jamwidgets-poll-percent">${percent}%</span>
             </div>
           `;
@@ -207,10 +209,11 @@ import Theme from "./Theme.astro";
           // Show without results (voted but results hidden)
           optionEl.innerHTML = `
             <div class="jamwidgets-poll-result jamwidgets-no-results ${isSelected ? "jamwidgets-voted" : ""}">
-              <span class="jamwidgets-poll-text">${option.text}</span>
+              <span class="jamwidgets-poll-text"></span>
             </div>
           `;
         }
+        optionEl.querySelector(".jamwidgets-poll-text")!.textContent = option.text;
         optionsEl.appendChild(optionEl);
       });
 

package/src/RandomPhoto.astro

@@ -0,0 +1,8 @@
+---
+interface Props { siteKey: string; slug: string; endpoint?: string; tag?: string; seed?: string }
+const { siteKey, slug, endpoint, tag, seed } = Astro.props;
+---
+<jamwidgets-random-photo site-key={siteKey} slug={slug} endpoint={endpoint} tag={tag} seed={seed} />
+<script>
+  import "@jamwidgets/core/gallery-elements";
+</script>

package/src/index.ts

@@ -20,6 +20,9 @@ export {
   type FormSubmitResponse,
   type SubscribeResponse,
   type JamwidgetsPost,
+  type JamwidgetsGallery,
+  type GalleryPhoto,
+  type GallerySummary,
   type SeriphPost, // deprecated alias
   type Announcement,
   type AnnouncementType,
@@ -94,6 +97,12 @@ export {
   fetchPosts,
   type FetchPostOptions,
   fetchPost,
+  type FetchGalleriesOptions,
+  fetchGalleries,
+  type FetchGalleryOptions,
+  fetchGallery,
+  type FetchRandomPhotoOptions,
+  fetchRandomPhoto,
 
   // Site config + powered-by attribution
   type SiteConfig,
@@ -130,4 +139,6 @@ export {
   seriphPostsLoader, // deprecated alias
   type JamwidgetsPostsLoaderOptions,
   type SeriphPostsLoaderOptions, // deprecated alias
+  jamwidgetsGalleriesLoader,
+  type JamwidgetsGalleriesLoaderOptions,
 } from "./loader.js";

package/src/loader.ts

@@ -27,6 +27,10 @@ import {
   type SeriphPost, // deprecated alias
   type FetchPostsOptions,
   type FetchPostOptions,
+  fetchGalleries as coreFetchGalleries,
+  fetchGallery as coreFetchGallery,
+  type JamwidgetsGallery,
+  type GallerySummary,
 } from "@jamwidgets/core";
 import type { Loader, LoaderContext } from "astro/loaders";
 
@@ -137,3 +141,49 @@ export function jamwidgetsPostsLoader(options: JamwidgetsPostsLoaderOptions): Lo
 
 /** @deprecated Use jamwidgetsPostsLoader instead */
 export const seriphPostsLoader = jamwidgetsPostsLoader;
+
+export interface JamwidgetsGalleriesLoaderOptions {
+  siteKey: string;
+  endpoint?: string;
+  origin?: string;
+  onError?: "throw" | "warn" | "ignore";
+}
+
+export function jamwidgetsGalleriesLoader(options: JamwidgetsGalleriesLoaderOptions): Loader {
+  const { endpoint = DEFAULT_ENDPOINT, origin, onError = "throw" } = options;
+  const siteKey = getSiteKey({ siteKey: options.siteKey });
+  return {
+    name: "jamwidgets-galleries-loader",
+    async load({ store, logger }: LoaderContext) {
+      try {
+        const summaries: GallerySummary[] = [];
+        let after: string | undefined;
+        do {
+          const page = await coreFetchGalleries({
+            siteKey,
+            endpoint,
+            origin,
+            limit: 100,
+            after,
+          });
+          summaries.push(...page.galleries);
+          after = page.nextCursor;
+        } while (after);
+        const galleries: Array<JamwidgetsGallery | null> = [];
+        for (const summary of summaries) {
+          galleries.push(
+            await coreFetchGallery({ siteKey, endpoint, origin, slug: summary.slug }),
+          );
+        }
+        const entries = galleries.filter((gallery): gallery is JamwidgetsGallery => gallery !== null);
+        store.clear();
+        for (const gallery of entries) store.set({ id: gallery.slug, data: { ...gallery } });
+        logger.info(`Loaded ${entries.length} galleries from Jamwidgets at build time`);
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        if (onError === "throw") throw error;
+        if (onError === "warn") logger.warn(`Error loading galleries: ${message}`);
+      }
+    },
+  };
+}