@vdaluz/astro-affiliate 1.1.1 → 1.2.0

package/README.md

@@ -110,25 +110,44 @@ Two ways to consume a channel, depending on where the affiliate link lives:
 
 ## Markdown links (`remarkAffiliate`)
 
-Wire the plugin into `astro.config.mjs`:
+The plugin runs on the remark/rehype pipeline from `@astrojs/markdown-remark`. Astro 7 no longer
+installs it by default (its default Markdown processor is Sätteri), so install it alongside this
+package:
+
+```sh
+npm install @astrojs/markdown-remark
+```
+
+On Astro 6.4 and later, including Astro 7, pass the plugin to the `unified()` processor in
+`astro.config.mjs`:
 
 ```js
+import { unified } from '@astrojs/markdown-remark';
 import { remarkAffiliate } from '@vdaluz/astro-affiliate/remark';
 import { affiliate } from './src/config/affiliate';
 
 export default defineConfig({
   markdown: {
-    remarkPlugins: [[remarkAffiliate, affiliate]],
+    processor: unified({
+      remarkPlugins: [[remarkAffiliate, affiliate]],
+    }),
   },
 });
 ```
 
-> **Use the `[plugin, options]` tuple, not `remarkAffiliate(affiliate)` pre-invoked.** Astro/unified
-> calls the plugin function itself with the options; passing an already-invoked transformer means
-> unified calls *that* with no arguments as if it were the attacher, which silently no-ops instead
-> of rewriting anything - the build stays green with `affiliate:key` links left untouched in the
-> output. Always verify by checking rendered HTML for the real resolved URL, not just a passing
-> build.
+On Astro 6.0 to 6.3, which predate `markdown.processor` and bundle `@astrojs/markdown-remark`
+themselves, use the top-level option instead: `markdown: { remarkPlugins: [[remarkAffiliate, affiliate]] }`.
+Astro 6.4+ still accepts that form but deprecates it, and Astro 7 fails at config load with it
+unless `@astrojs/markdown-remark` is installed.
+
+> **Use the `[plugin, options]` tuple, not `remarkAffiliate(affiliate)` pre-invoked.** unified
+> calls the plugin function itself with the options. Passing an already-invoked transformer means
+> unified calls *that* as the plugin, with no document, and the build fails with
+> `remarkAffiliate was passed pre-invoked`. Always verify by checking rendered HTML for the real
+> resolved URL, not just a passing build.
+
+Components-only consumers (`<AffiliateLink>`, `<AffiliateDisclosure>`) don't need
+`@astrojs/markdown-remark`; it's an optional peer dependency.
 
 Then in a post's markdown body:
 
@@ -204,7 +223,8 @@ const { affiliates = [] } = entry.data;
 ```
 
 Renders one paragraph joining the disclosure text for every program in `affiliates`, or nothing
-if the array is empty. Default styling is `text-sm text-muted italic`; pass `class` to override,
+if the array is empty. A program named more than once (for example, one entry per card in a
+card list) is disclosed once. Default styling is `text-sm text-muted italic`; pass `class` to override,
 see [Per-app glue](#per-app-glue) for the token variables this assumes.
 
 ### Localized disclosure text
@@ -244,7 +264,8 @@ import { affiliate } from '../config/affiliate';
 const disclosures = resolveDisclosures(affiliate, entry.data.affiliates ?? [], locale);
 ```
 
-It returns the resolved text for each program name in order (see [Localized disclosure
+It returns the resolved text for each distinct program name, in first-seen order - a name passed
+more than once appears once (see [Localized disclosure
 text](#localized-disclosure-text) for how `locale` selects between entries), and throws if any
 name isn't a program declared in `config.programs` - the same guarantee `<AffiliateDisclosure>`
 relies on internally, so a plain-text consumer can't silently drop a disclosure for a typo'd
@@ -323,7 +344,8 @@ Publishing / OIDC, no token secret):
 
 1. Test before tagging: `npm pack`, install the tarball into a scratch Astro app (or a consumer
    locally), `astro check && astro build`.
-2. Bump `version` in `package.json`, commit.
+2. Bump the version with `npm version X.Y.Z --no-git-tag-version`, which updates `package.json`
+   and `package-lock.json` together, then commit both.
 3. Tag `vX.Y.Z` and push the tag. Pushing the tag runs `.github/workflows/publish.yml`, which
    type-checks, tests, verifies the tag matches `package.json`'s version, and only then runs
    `npm publish`.
@@ -336,6 +358,8 @@ Publishing / OIDC, no token secret):
 - [imperfectsystems.com](https://imperfectsystems.com)
 - [freetoolbox.net](https://freetoolbox.net)
 - [vicstradamus.com](https://vicstradamus.com)
+- [deepcutatlas.com](https://deepcutatlas.com)
+- [roomforstars.com](https://roomforstars.com)
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vdaluz/astro-affiliate",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "FTC-compliant affiliate-link catalog resolver and disclosure components - proven in production on vdaluz.com and imperfectsystems.com.",
   "keywords": [
     "astro",
@@ -37,10 +37,17 @@
     "./AffiliateDisclosure.astro": "./src/components/AffiliateDisclosure.astro"
   },
   "peerDependencies": {
+    "@astrojs/markdown-remark": ">=7.0.0",
     "astro": ">=6.0.0"
   },
+  "peerDependenciesMeta": {
+    "@astrojs/markdown-remark": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@astrojs/check": "^0.9.10",
+    "@astrojs/markdown-remark": "^7.3.1",
     "@types/node": "^26.1.1",
     "astro": "^7.3.2",
     "typescript": "^6.0.3"

package/src/components/AffiliateDisclosure.astro

@@ -1,6 +1,6 @@
 ---
-import type { AffiliateConfig } from '../lib/types';
-import { resolveDisclosures } from '../lib/disclosures';
+import type { AffiliateConfig } from '../lib/types.ts';
+import { resolveDisclosures } from '../lib/disclosures.ts';
 
 interface Props {
   config: AffiliateConfig;

package/src/components/AffiliateLink.astro

@@ -1,6 +1,6 @@
 ---
-import type { AffiliateConfig } from '../lib/types';
-import { resolveAffiliate } from '../lib/resolve';
+import type { AffiliateConfig } from '../lib/types.ts';
+import { resolveAffiliate } from '../lib/resolve.ts';
 
 interface Props {
   config: AffiliateConfig;

package/src/lib/disclosures.ts

@@ -5,10 +5,11 @@ import { resolveLocalized } from './i18n.ts';
  * Resolves a post's `affiliates:` frontmatter names to their disclosure text.
  * Throws on an unknown program name instead of silently omitting its
  * disclosure - a typo'd/renamed program must fail the build, not ship a
- * page that uses the program without disclosing it.
+ * page that uses the program without disclosing it. Repeated program names
+ * collapse to one entry, in first-seen order.
  */
 export function resolveDisclosures(config: AffiliateConfig, affiliates: string[], locale?: string): string[] {
-  return affiliates.map((name) => {
+  return [...new Set(affiliates)].map((name) => {
     const program = config.programs[name];
     if (!program) {
       throw new Error(

package/src/lib/remark.ts

@@ -68,14 +68,21 @@ function assertNoRemainingAffiliateUrls(node: MdastNode) {
  * For a reference-style link (`[text][ref]`), "document order" follows the
  * position of the `[ref]: affiliate:key` definition, not the in-prose usage.
  *
+ *   import { unified } from '@astrojs/markdown-remark';
  *   import { remarkAffiliate } from '@vdaluz/astro-affiliate/remark';
  *
  *   export default defineConfig({
- *     markdown: { remarkPlugins: [[remarkAffiliate, affiliate]] },
+ *     markdown: { processor: unified({ remarkPlugins: [[remarkAffiliate, affiliate]] }) },
  *   });
  */
 export function remarkAffiliate(config: AffiliateConfig) {
   return (tree: MdastNode, file: VFileWithAstroFrontmatter) => {
+    // unified calls a pre-invoked remarkAffiliate(config) as the plugin attacher, with no tree.
+    if (!tree) {
+      throw new Error(
+        'remarkAffiliate was passed pre-invoked. Pass it as a [remarkAffiliate, config] tuple instead.'
+      );
+    }
     const linkNodes: MdastNode[] = [];
     collectAffiliateLinkNodes(tree, linkNodes);