@sarimarcus/content-sites-ui 0.31.3 → 0.31.5

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All packages in the platform release in lockstep; entries are per release version.
 
+## 0.31.5 (2026-10-08)
+
+- No changes; lockstep release with core (SLA-2998).
+
+## 0.31.4 (2026-10-08)
+
+- `./affiliate`: `GygActivity`, a cached GYG activity with its provider `id` (required string) and `rating`/`reviewCount` (required), on top of `GygCardActivity`. It is the type the three sites declare locally, with `id` narrowed to required (Córdoba and Granada declare it optional; every cached activity has one); their copies move to this import at adoption (`extracted.json` partial entries: no-recreate enforces the move from 0.32.0, and a site may adopt earlier) (SLA-3020).
+- `./affiliate`: `selectActivities` takes `exclusive` (only the pinned activities, in `pinnedIds` order, an id listed twice shown twice, no fill), `dedupeTitles` (keeps the first activity of each trimmed, lower-cased title) and `match` (how a pinned id finds its activity; default unchanged: ids equal once `gyg-` is stripped). `SelectableActivity` gains an optional `title`. Every option defaults off, so existing calls return what they did (SLA-3020).
+- `./affiliate`: `AffiliateCarousel` picks its cards through `selectActivities` (`exclusive` with its own numeric id rule when `ids` is set, `dedupeTitles` otherwise). Output is unchanged: `render-diff.mjs` over `.planning/platform/sla-3020-render-diff-cases.json` renders 9 cases identically to 0.31.3 (SLA-3020).
+- `./types`: `BrandTone` (`'primary' | 'secondary' | 'accent'`). `RelatedTone` and `NavTone` are now aliases of it, and `InsiderTipTone` is `BrandTone | 'muted'`; the inline unions of `EventInfoRow.tone`, `FeatureList` `color`, `QuickFacts` action `color`, `NumberedStep` `tone` and `Chip` `accent` use it. Type-only (SLA-3020).
+
+### Deprecated
+
+- `./affiliate` `AffiliateCarousel` `idOf`: no site passes it, and the default id rule stays. Removed in the next minor (SLA-3020).
+- `./editorial` `SourceItem`: an alias of `SourceInput`; import `SourceInput` from `./seo`. Removed in the next minor (SLA-3020).
+
 ## 0.31.3 (2026-10-08)
 
 - No changes; lockstep release with tourism (SLA-3019).

package/README.md

@@ -115,7 +115,8 @@ barrel. Put such rules in a stylesheet entry the one route imports.
 ```ts
 import { ArticleKeyFacts, AuthorCard, AuthorStrip, ArticleCard, ArticleGrid, ArticleCategoryNav, InsiderTips } from '@sarimarcus/content-sites-ui/editorial';
 import { RelatedContent, RelatedContentCard } from '@sarimarcus/content-sites-ui/composed';
-import type { ArticleSummary, AuthorSummary, KeyFact, SourceItem } from '@sarimarcus/content-sites-ui/editorial';
+import type { ArticleSummary, AuthorSummary, KeyFact } from '@sarimarcus/content-sites-ui/editorial';
+import type { SourceInput } from '@sarimarcus/content-sites-ui/seo';
 import type { RelatedItem } from '@sarimarcus/content-sites-ui/composed';
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sarimarcus/content-sites-ui",
-  "version": "0.31.3",
+  "version": "0.31.5",
   "description": "Universal Astro UI components, layout shell and design tokens shared by the content sites.",
   "type": "module",
   "license": "MIT",
@@ -49,6 +49,6 @@
     "@lucide/astro": "^1.23.0",
     "astro": "^7.0.6",
     "tailwindcss": "^4.1.18",
-    "@sarimarcus/content-sites-core": "0.31.3"
+    "@sarimarcus/content-sites-core": "0.31.5"
   }
 }

package/src/affiliate/AffiliateCarousel.astro

@@ -1,13 +1,15 @@
 ---
 /**
- * AffiliateCarousel — a CardCarousel strip of AffiliateCards. With `ids`, the strip renders exactly those
- * activities in that running order (an editor's list; `idOf` reads an activity's numeric id). Without, the most
- * reviewed come first, titles deduplicated so near-duplicate listings don't eat the strip. Either way at most
- * `maxCards`. `resolve` turns a visible activity into the card's props (called only for the cards rendered);
- * without it each activity already is one. The disclosure arrives through the `disclosure` slot.
+ * AffiliateCarousel — a CardCarousel strip of AffiliateCards, chosen by `selectActivities`. With `ids`, the strip
+ * renders exactly those activities in that running order (an editor's list, `exclusive`; an activity's numeric id is
+ * its `id` without a non-digit prefix, so `gyg-12`, `x-12` and `12` all match 12). Without, the most reviewed come
+ * first, titles deduplicated so near-duplicate listings don't eat the strip. Either way at most `maxCards`. `resolve`
+ * turns a visible activity into the card's props (called only for the cards rendered); without it each activity
+ * already is one. The disclosure arrives through the `disclosure` slot.
  */
 import CardCarousel from '../composed/CardCarousel.astro';
 import AffiliateCard from './AffiliateCard.astro';
+import { selectActivities } from './select';
 import type { AffiliateCardItem, AffiliateCardOptions } from './types';
 
 type Activity = { id?: string | number; title?: string; reviewCount?: number; [key: string]: unknown };
@@ -15,6 +17,7 @@ type Activity = { id?: string | number; title?: string; reviewCount?: number; [k
 interface Props {
   activities: Activity[];
   ids?: number[];
+  /** @deprecated No site passes it; the default reading stays. Removed in the next minor (SLA-3020). */
   idOf?: (activity: Activity) => number;
   resolve?: (activity: any) => AffiliateCardItem;
   heading?: string;
@@ -46,21 +49,12 @@ const {
   class: className,
 } = Astro.props;
 
-const all = activities ?? [];
-const sorted = [...all].sort((a, b) => (b.reviewCount ?? 0) - (a.reviewCount ?? 0));
-const seen = new Set<string>();
-const deduped = sorted.filter((a) => {
-  const key = String(a.title ?? '').trim().toLowerCase();
-  if (seen.has(key)) return false;
-  seen.add(key);
-  return true;
-});
-
-const filtered = ids
-  ? ids.map((wanted) => all.find((a) => idOf(a) === wanted)).filter((a): a is Activity => Boolean(a))
-  : deduped;
+const shown = selectActivities(
+  activities,
+  ids ? { pinnedIds: ids, exclusive: true, match: (a, wanted) => idOf(a) === wanted, maxCards } : { dedupeTitles: true, maxCards },
+);
 
-const visible = filtered.slice(0, maxCards).map((a) => {
+const visible = shown.map((a) => {
   const { id: _id, ...item } = resolve(a);
   return item;
 });

package/src/affiliate/cardItem.ts

@@ -15,6 +15,13 @@ export interface GygCardActivity {
   language: string;
 }
 
+/** A cached GYG activity with its provider id (`gyg-N` or N) and review figures, as the sites' card and carousel adapters read it. */
+export interface GygActivity extends GygCardActivity {
+  id: string;
+  rating: number;
+  reviewCount: number;
+}
+
 const LOCALES: Record<string, string> = { en: 'en-GB', fr: 'fr-FR' };
 
 /** The card's number/currency locale for an activity's language code; en-GB when unknown. */

package/src/affiliate/index.ts

@@ -13,7 +13,7 @@ export { default as AffiliateComparisonTable } from './AffiliateComparisonTable.
 export { default as HotelAffiliateCTA } from './HotelAffiliateCTA.astro';
 export { externalResources, emeraldResources, EMERALD_ORIGIN, widgetLoaders } from './resources';
 export { widgetSrc } from './widgetSrc';
-export { gygCardItem, gygCardLocale, type GygCardActivity } from './cardItem';
+export { gygCardItem, gygCardLocale, type GygCardActivity, type GygActivity } from './cardItem';
 export type { WidgetKind, CspDirective, WidgetResources } from './resources';
 export type { AffiliateCardLabels, AffiliateCardOptions, AffiliateCardItem, HotelCtaLabels, ComparisonRow, ComparisonTableLabels } from './types';
 export { selectActivities, type SelectableActivity, type SelectOptions } from './select';

package/src/affiliate/select.ts

@@ -1,10 +1,11 @@
 /** An activity a card band can order: a provider id ("gyg-N" or N) and its review count. */
 export interface SelectableActivity {
   id?: string | number;
+  title?: string;
   reviewCount?: number;
 }
 
-export interface SelectOptions {
+export interface SelectOptions<T extends SelectableActivity = SelectableActivity> {
   /** Ids shown first, in this order; "gyg-10" and 10 match the same activity. */
   pinnedIds?: ReadonlyArray<string | number>;
   /** Keep the rest in the given order instead of most-reviewed first. */
@@ -12,22 +13,53 @@ export interface SelectOptions {
   maxCards?: number;
   /** Called for a pinned id with no matching activity. */
   onMissingPin?: (id: string | number) => void;
+  /**
+   * Only the pinned activities, in pinnedIds order, with no fill: an editor's list. An id listed twice shows twice,
+   * and no id is skipped before `match` sees it.
+   */
+  exclusive?: boolean;
+  /** Drop an activity whose trimmed, lower-cased title an earlier one already has (an untitled one counts as ''). */
+  dedupeTitles?: boolean;
+  /** With `exclusive`: whether an activity is the one a pinned id names; default: ids equal once a `gyg-` prefix is stripped. */
+  match?: (activity: T, wanted: string | number) => boolean;
 }
 
 const idKey = (value: string | number | undefined) => (value === undefined ? '' : String(value).replace(/^gyg-/, ''));
 
+const titleKey = (activity: SelectableActivity) => String(activity.title ?? '').trim().toLowerCase();
+
+function withoutDuplicateTitles<T extends SelectableActivity>(list: T[]): T[] {
+  const seen = new Set<string>();
+  return list.filter((activity) => {
+    const key = titleKey(activity);
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
+}
+
 /** The activities a card band shows: pinned ids first, then the rest by review count (or as given), capped. */
-export function selectActivities<T extends SelectableActivity>(activities: ReadonlyArray<T> | undefined, options: SelectOptions = {}): T[] {
-  const { pinnedIds = [], keepOrder = false, maxCards = 4, onMissingPin } = options;
+export function selectActivities<T extends SelectableActivity>(activities: ReadonlyArray<T> | undefined, options: SelectOptions<T> = {}): T[] {
+  const { pinnedIds = [], keepOrder = false, maxCards = 4, onMissingPin, exclusive = false, dedupeTitles = false, match } = options;
   const pool = [...(activities ?? [])];
+  if (exclusive) {
+    const matches = match ?? ((activity: T, wanted: string | number) => idKey(wanted) !== '' && idKey(activity.id) === idKey(wanted));
+    const listed: T[] = [];
+    for (const wanted of pinnedIds) {
+      const found = pool.find((activity) => matches(activity, wanted));
+      if (found) listed.push(found);
+      else onMissingPin?.(wanted);
+    }
+    return (dedupeTitles ? withoutDuplicateTitles(listed) : listed).slice(0, maxCards);
+  }
   const pinned: T[] = [];
   const pinnedKeys = new Set<string>();
   for (const wanted of pinnedIds) {
     const key = idKey(wanted);
     if (!key || pinnedKeys.has(key)) continue;
-    const match = pool.find((activity) => idKey(activity.id) === key);
-    if (match) {
-      pinned.push(match);
+    const found = pool.find((activity) => idKey(activity.id) === key);
+    if (found) {
+      pinned.push(found);
       pinnedKeys.add(key);
     } else {
       onMissingPin?.(wanted);
@@ -36,5 +68,6 @@ export function selectActivities<T extends SelectableActivity>(activities: Reado
   const unpinned = pool.filter((activity) => !pinnedKeys.has(idKey(activity.id)));
   // A missing count sorts as 0, so it lands after every reviewed activity instead of breaking the comparator.
   const rest = keepOrder ? unpinned : unpinned.sort((a, b) => (b.reviewCount ?? 0) - (a.reviewCount ?? 0));
-  return [...pinned, ...rest].slice(0, maxCards);
+  const ordered = [...pinned, ...rest];
+  return (dedupeTitles ? withoutDuplicateTitles(ordered) : ordered).slice(0, maxCards);
 }

package/src/composed/QuickFacts.astro

@@ -22,6 +22,7 @@
  */
 
 import Icon from '../primitives/Icon.astro';
+import type { BrandTone } from '../types';
 
 interface QuickFactItem {
   icon: string;
@@ -37,7 +38,7 @@ interface ActionLink {
   href: string;
   label: string;
   icon: string;
-  color: 'primary' | 'secondary' | 'accent';
+  color: BrandTone;
 }
 
 interface Props {

package/src/composed/related.ts

@@ -1,6 +1,7 @@
 import type { ImageMetadata } from 'astro';
+import type { BrandTone } from '../types';
 
-export type RelatedTone = 'primary' | 'accent' | 'secondary';
+export type RelatedTone = BrandTone;
 
 /** A related-content card. Images are optimised imports, never public path strings. */
 export interface RelatedItem {

package/src/editorial/NumberedStep.astro

@@ -3,11 +3,13 @@
  * NumberedStep — one stage of a multi-stage plan: a round marker, a title and a subtitle, then the stage's prose in
  * a card (default slot). `tone` colours the marker and the card; the accent tone tints the card too.
  */
+import type { BrandTone } from '../types';
+
 interface Props {
   marker: string;
   title: string;
   subtitle: string;
-  tone?: 'primary' | 'accent' | 'secondary';
+  tone?: BrandTone;
 }
 
 const { marker, title, subtitle, tone = 'primary' } = Astro.props;

package/src/editorial/event.ts

@@ -1,11 +1,11 @@
-import type { TrustedHtml } from '../types';
+import type { BrandTone, TrustedHtml } from '../types';
 
 export type EventInfoIcon = 'clock' | 'sun' | 'pen' | 'bus';
 
 /** One row of an EventPage practical-information box. */
 export interface EventInfoRow {
   icon: EventInfoIcon;
-  tone: 'primary' | 'secondary' | 'accent';
+  tone: BrandTone;
   label: string;
   /** Plain text, or `html` for rendered markdown. */
   text?: string;

package/src/editorial/types.ts

@@ -1,5 +1,5 @@
 import type { ImageMetadata } from 'astro';
-import type { TrustedHtml } from '../types';
+import type { BrandTone, TrustedHtml } from '../types';
 import type { SourceInput } from '../seo/types';
 
 /** A person as listed on author strips and cards. The byline shape is ui/seo `ArticleAuthor`. */
@@ -34,6 +34,7 @@ export interface KeyFact {
   detailHtml?: TrustedHtml;
 }
 
+/** @deprecated Import `SourceInput` from `@sarimarcus/content-sites-ui/seo`. Removed in the next minor (SLA-3020). */
 export type SourceItem = SourceInput;
 
 /** The fields ArticleCategoryNav reads from a site's category map entry. */
@@ -59,7 +60,7 @@ export interface ArticleCategoryLink {
   active: boolean;
 }
 
-export type InsiderTipTone = 'primary' | 'accent' | 'secondary' | 'muted';
+export type InsiderTipTone = BrandTone | 'muted';
 
 /** Site-defined tip kinds: the key stored in content, its badge label and its tone. */
 export type InsiderTipKinds = Record<string, { label: string; tone: InsiderTipTone }>;

package/src/navigation/types.ts

@@ -1,5 +1,6 @@
 // Public contracts for site chrome. Sites own every value: labels, hrefs, icons, logos and copy.
 import type { ImageMetadata } from 'astro';
+import type { BrandTone } from '../types';
 
 /** Who the site is, as the header, footer and copyright line name it. */
 export interface SiteIdentity {
@@ -31,7 +32,7 @@ export interface FooterSection {
 }
 
 /** The colour role a navigation item is tinted with. */
-export type NavTone = 'primary' | 'secondary' | 'accent';
+export type NavTone = BrandTone;
 
 /** A hub link ("All articles") with an optional shorter or longer label for the mobile menu. */
 export interface NavHubLink extends NavLink {

package/src/primitives/Badge.astro

@@ -25,12 +25,13 @@
 // ------------------------------------------------------------------
 import type { HTMLAttributes } from 'astro/types';
 import Icon from './Icon.astro';
+import type { BrandTone } from '../types';
 import { PILL_BASE } from './pillRecipe';
 
 // Extends the span attributes so call sites can pass id / aria-* / data-* / slot through.
 interface Props extends Omit<HTMLAttributes<'span'>, 'class'> {
   /** Preset color. Use `custom` + `toneClass` for runtime category/type color maps. */
-  tone?: 'primary' | 'secondary' | 'accent' | 'neutral' | 'onImage' | 'custom';
+  tone?: BrandTone | 'neutral' | 'onImage' | 'custom';
   /** Color classes for tone="custom" (e.g. typeColors[type]). */
   toneClass?: string;
   size?: 'sm' | 'md' | 'lg';

package/src/primitives/Chip.astro

@@ -43,8 +43,9 @@
 import type { HTMLAttributes } from 'astro/types';
 import Icon from './Icon.astro';
 import { PILL_BASE } from './pillRecipe';
+import type { BrandTone } from '../types';
 
-type Accent = 'primary' | 'secondary' | 'accent' | 'neutral';
+type Accent = BrandTone | 'neutral';
 type Tone = 'outline' | 'outlineMuted' | 'outlineQuiet' | 'muted' | 'tint' | 'onImage' | 'custom';
 
 // `type`/`href`/`rel`/`target` are Omitted rather than just redeclared, because HTMLAttributes<'a'>

package/src/primitives/FeatureList.astro

@@ -15,13 +15,13 @@
  */
 
 import Icon from './Icon.astro';
-import type { TrustedHtml } from '../types';
+import type { BrandTone, TrustedHtml } from '../types';
 
 interface Props {
   title?: string;
   items: TrustedHtml[];
   variant?: 'checklist' | 'tags';
-  color?: 'primary' | 'accent' | 'secondary';
+  color?: BrandTone;
   icon?: string;
   container?: boolean;
   /** Tighter padding/margin for space-constrained contexts (e.g. article interludes). */

package/src/primitives/LinkArrow.astro

@@ -1,10 +1,11 @@
 ---
 import { newTab } from './newTab';
+import type { BrandTone } from '../types';
 import ArrowGlyph from './ArrowGlyph.astro';
 interface Props {
   href: string;
   size?: 'sm' | 'base';
-  color?: 'primary' | 'secondary' | 'accent' | 'onImage';
+  color?: BrandTone | 'onImage';
   /** Overrides the http(s) detection: '_blank' on any href, '_self' to keep an off-site link in the tab. */
   target?: '_blank' | '_self';
   /** Defaults to 'noopener noreferrer' whenever the link opens a new tab. */

package/src/types/index.ts

@@ -8,6 +8,9 @@ declare const trusted: unique symbol;
  */
 export type TrustedHtml = string & { readonly [trusted]: true };
 
+/** The three brand colour roles a component can be tinted with; wider tone unions add their extra members to it. */
+export type BrandTone = 'primary' | 'secondary' | 'accent';
+
 /** Mark site-rendered HTML as safe to inject with set:html. */
 export const trustedHtml = (html: string): TrustedHtml => html as TrustedHtml;