astro-lilypond 1.1.1 → 1.2.0

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { type AstroComponentFactory } from "astro/runtime/server/index.js";
 import { type AutoInstallOptions } from "./binary/index.js";
 import { type PluginOptions } from "./plugins/index.js";
 import { type LilypondDefaults } from "./render.js";
-import { type LilypondMetadata } from "./utils/index.js";
+import { type LilypondMetadata, type RenderedHtmlOptions } from "./utils/index.js";
 export declare const LY_EXTENSIONS: readonly [".ly", ".lilypond", ".ily"];
 export type { AstroComponentFactory, AutoInstallOptions, LilypondDefaults, LilypondMetadata, PluginOptions as LilypondPluginOptions, };
 export interface LilypondPage {
@@ -54,12 +54,7 @@ export interface GetScoreResult {
     meta: LilypondMetadata;
     raw: string;
 }
-interface ScoreImageProps {
-    pageLimit?: number;
-    class?: string;
-    style?: string;
-    alt?: string;
-}
+type ScoreImageProps = RenderedHtmlOptions;
 /**
  * Renders a `LilypondScore` (from a `.ly`/`.ily`/`.lilypond` import,
  * or a `lilypondLoader()` entry) to a renderable `<Score />` component.

package/dist/index.js

@@ -10,11 +10,7 @@ export const LY_EXTENSIONS = [".ly", ".lilypond", ".ily"];
 function createScoreComponent(content) {
     return createComponent((_result, props) => {
         const alt = props.alt ?? content.alt ?? "";
-        const html = renderedHtml(content.pages, alt, {
-            class: props.class,
-            style: props.style,
-            pageLimit: props.pageLimit,
-        });
+        const html = renderedHtml(content.pages, { ...props, alt });
         return renderTemplate `${unescapeHTML(html)}`;
     });
 }
@@ -106,6 +102,13 @@ export const Score = createComponent(async (result, props) => {
     const { Score: ContentScore } = await getScore(content, { format, crop });
     return renderTemplate `${renderComponent(result, "Score", ContentScore, imageProps)}`;
 });
+function injectMarkdownPlugin(processor, key, plugin) {
+    if (!processor.options) {
+        processor.options = {};
+    }
+    const options = processor.options;
+    options[key] = [...(options[key] ?? []), plugin];
+}
 function lyFilePlugin(options) {
     return {
         name: "vite-plugin-astro-lilypond-ly",
@@ -164,44 +167,17 @@ export default function lilypond(options = {}) {
                 });
                 const existingProcessor = config.markdown?.processor;
                 if (existingProcessor?.name === "satteri") {
-                    const { satteri, isSatteriProcessor } = await import("@astrojs/markdown-satteri");
-                    if (!isSatteriProcessor(existingProcessor)) {
-                        throw new Error("astro-lilypond: the active markdown processor reports the name " +
-                            '"satteri" but failed the isSatteriProcessor check.');
-                    }
-                    const existingOptions = existingProcessor.options ?? {};
-                    updateConfig({
-                        markdown: {
-                            processor: satteri({
-                                ...existingOptions,
-                                mdastPlugins: [
-                                    ...(existingOptions.mdastPlugins ?? []),
-                                    satteriPlugin(options),
-                                ],
-                            }),
-                        },
-                    });
+                    injectMarkdownPlugin(existingProcessor, "mdastPlugins", satteriPlugin(options));
+                    updateConfig({ markdown: { processor: existingProcessor } });
                     logger?.info("Registered Sätteri mdast plugin");
                     return;
                 }
                 if (existingProcessor?.name === "unified") {
-                    const { unified, isUnifiedProcessor } = await import("@astrojs/markdown-remark");
-                    if (!isUnifiedProcessor(existingProcessor)) {
-                        throw new Error("astro-lilypond: the active markdown processor reports the name " +
-                            '"unified" but failed the isUnifiedProcessor check.');
-                    }
-                    const existingOptions = existingProcessor.options ?? {};
-                    updateConfig({
-                        markdown: {
-                            processor: unified({
-                                ...existingOptions,
-                                remarkPlugins: [
-                                    ...(existingOptions.remarkPlugins ?? []),
-                                    [remarkPlugin, options],
-                                ],
-                            }),
-                        },
-                    });
+                    injectMarkdownPlugin(existingProcessor, "remarkPlugins", [
+                        remarkPlugin,
+                        options,
+                    ]);
+                    updateConfig({ markdown: { processor: existingProcessor } });
                     logger?.info("Registered unified remark plugin");
                     return;
                 }

package/dist/plugins/renderMarkdownBlock.js

@@ -32,7 +32,7 @@ export async function renderMarkdownBlock(options, block) {
                 logger,
             }),
         });
-        return renderedHtml(pages, alt);
+        return renderedHtml(pages, { alt });
     }
     catch (err) {
         if (!options.isDev)

package/dist/utils/index.d.ts

@@ -16,7 +16,7 @@ export type { LyHeaderFields } from "./parseLyHeader.js";
 export { extractMarkupText, parseLyHeader, parseLyHeaderFields, } from "./parseLyHeader.js";
 export { prependVersion } from "./prependVersion.js";
 export { renderedErrorHtml } from "./renderedErrorHtml.js";
-export { renderedHtml } from "./renderedHtml.js";
+export { type RenderedHtmlOptions, renderedHtml } from "./renderedHtml.js";
 export { resolveDefaults } from "./resolveDefaults.js";
 export { sourceNameFor } from "./sourceNameFor.js";
 export { titleFor } from "./titleFor.js";

package/dist/utils/renderedHtml.d.ts

@@ -1,5 +1,6 @@
+import type { HTMLAttributes } from "astro/types";
 import type { LilypondPage } from "../index.js";
-export interface RenderedHtmlOptions {
+export interface RenderedHtmlOptions extends Partial<Pick<HTMLAttributes<"img">, "alt" | "loading" | "decoding" | "fetchpriority">> {
     /** Class applied to the outer `<img>` or `<ol>` tag. */
     class?: string;
     /** Inline styles applied to the outer `<img>` or `<ol>`. */
@@ -7,4 +8,4 @@ export interface RenderedHtmlOptions {
     /** Render only the first `n` pages. */
     pageLimit?: number;
 }
-export declare function renderedHtml(pages: LilypondPage[], alt: string, options?: RenderedHtmlOptions): string;
+export declare function renderedHtml(pages: LilypondPage[], options?: RenderedHtmlOptions): string;

package/dist/utils/renderedHtml.js

@@ -1,19 +1,23 @@
 import { addAttribute } from "astro/runtime/server/index.js";
-function imgTag(page, alt) {
-    return `<img data-lilypond-image${addAttribute(page.src, "src")}${addAttribute(page.width, "width")}${addAttribute(page.height, "height")}${addAttribute(alt, "alt")}>`;
+function imgTag(page, alt, imageAttrs) {
+    return `<img data-lilypond-image${addAttribute(page.src, "src")}${addAttribute(page.width, "width")}${addAttribute(page.height, "height")}${addAttribute(alt, "alt")}${imageAttrs}>`;
 }
-export function renderedHtml(pages, alt, options = {}) {
-    const { class: className, style, pageLimit } = options;
+export function renderedHtml(pages, options = {}) {
+    const { alt, class: className, style, pageLimit, loading, decoding, fetchpriority, } = options;
+    const resolvedAlt = alt ?? "";
     const limitedPages = pageLimit === undefined ? pages : pages.slice(0, pageLimit);
     if (limitedPages.length === 0)
         return "";
     const classAttr = addAttribute(className, "class");
     const styleAttr = addAttribute(style, "style");
+    const imageAttrs = addAttribute(loading, "loading") +
+        addAttribute(decoding, "decoding") +
+        addAttribute(fetchpriority, "fetchpriority");
     if (limitedPages.length === 1) {
         const page = limitedPages[0];
-        return `<img data-lilypond-image${classAttr}${addAttribute(page.src, "src")}${addAttribute(page.width, "width")}${addAttribute(page.height, "height")}${addAttribute(alt, "alt")}${styleAttr}>`;
+        return `<img data-lilypond-image${classAttr}${addAttribute(page.src, "src")}${addAttribute(page.width, "width")}${addAttribute(page.height, "height")}${addAttribute(resolvedAlt, "alt")}${imageAttrs}${styleAttr}>`;
     }
     return `<ol data-lilypond-group${classAttr}${styleAttr}>${limitedPages
-        .map((page) => `<li>${imgTag(page, alt)}</li>`)
+        .map((page) => `<li>${imgTag(page, resolvedAlt, imageAttrs)}</li>`)
         .join("")}</ol>`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-lilypond",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "An Astro integration for rendering Lilypond markup to music notation.",
   "homepage": "https://lilypond.ky.fyi",
   "author": "Ky Decker",
@@ -46,24 +46,30 @@
     "utils"
   ],
   "peerDependencies": {
+    "@astrojs/markdown-remark": ">=7.0.0",
     "astro": ">=7.0.0"
   },
+  "peerDependenciesMeta": {
+    "@astrojs/markdown-remark": {
+      "optional": true
+    }
+  },
   "dependencies": {
     "astro-emit-asset": "^0.1.4",
     "unist-util-visit": "^5.1.0"
   },
   "devDependencies": {
-    "@astrojs/markdown-remark": "^7.2.2",
-    "@astrojs/markdown-satteri": "^0.3.5",
+    "@astrojs/markdown-remark": "^7.3.1",
+    "@astrojs/markdown-satteri": "^0.4.1",
     "@types/mdast": "^4.0.4",
-    "@types/node": "^26.1.1",
-    "@vitest/coverage-v8": "^4.1.10",
-    "astro": "^7.1.6",
-    "satteri": "^0.9.5",
+    "@types/node": "^26.4.0",
+    "@vitest/coverage-v8": "^4.1.11",
+    "astro": "^7.3.2",
+    "satteri": "^0.10.5",
     "typescript": "^7.0.2",
     "unified": "^11.0.5",
-    "vite": "^8.0.0",
-    "vitest": "^4.1.10"
+    "vite": "^8.2.2",
+    "vitest": "^4.1.11"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",