astro-lilypond 0.16.1 → 0.16.2

package/README.md

@@ -3,7 +3,7 @@
 An [Astro](https://astro.build) integration for rendering [LilyPond](https://lilypond.org) music notation to images.
 
 - Render musical scores via Markdown or with an Astro component.
-- Works with remark, rehype and satteri Markdown processors out-of-the-box.
+- Works with remark and satteri Markdown processors out-of-the-box.
 - Zero client-side JavaScript! Images are compiled at build time.
 - Automatic `alt` text generated from the score’s title and composer. (Or supply your own.)
 - Use the content loader to pass in a folder full of `.ly` files and get back an Astro content collection.

package/dist/index.js

@@ -1,6 +1,6 @@
 import { createComponent, renderComponent, renderTemplate, unescapeHTML, } from "astro/runtime/server/index.js";
 import emitAssetIntegration from "astro-emit-asset";
-import { rehypePlugin, remarkPlugin, satteriPlugin, } from "./plugins/index.js";
+import { remarkPlugin, satteriPlugin, } from "./plugins/index.js";
 import { render as renderScore } from "./render.js";
 import { getRenderState, resolveAndSetRenderState } from "./renderState.js";
 import { altTextFor, emitLilypondAsset, emitLilypondPdfAsset, includePathsFor, lyTypeDeclarationsFor, parseLyHeaderFields, prependVersion, renderedHtml, resolveDefaults, sourceNameFor, titleFor, toLilypondMetadata, } from "./utils/index.js";
@@ -162,14 +162,10 @@ export default function lilypond(options = {}) {
                                     ...(existingOptions.remarkPlugins ?? []),
                                     [remarkPlugin, options],
                                 ],
-                                rehypePlugins: [
-                                    ...(existingOptions.rehypePlugins ?? []),
-                                    [rehypePlugin, options],
-                                ],
                             }),
                         },
                     });
-                    logger?.info("astro-lilypond: registered unified remark/rehype plugins");
+                    logger?.info("astro-lilypond: registered unified remark plugin");
                     return;
                 }
                 throw new Error("astro-lilypond requires a processor-based Astro markdown config. " +

package/dist/plugins/index.d.ts

@@ -1,4 +1,3 @@
-export { rehypePlugin } from "./rehype.js";
 export { remarkPlugin } from "./remark.js";
 export { satteriPlugin } from "./satteri.js";
 export type { PluginOptions } from "./types.js";

package/dist/plugins/index.js

@@ -1,3 +1,2 @@
-export { rehypePlugin } from "./rehype.js";
 export { remarkPlugin } from "./remark.js";
 export { satteriPlugin } from "./satteri.js";

package/dist/plugins/satteri.js

@@ -3,9 +3,6 @@ import { altTextForBlock, emitLilypondAsset, includePathsFor, isLilypondLang, pr
 export function satteriPlugin(options) {
     return {
         name: "astro-lilypond",
-        // Returning an mdast Html node (type: 'html') emits the value verbatim.
-        // Sätteri's { rawHtml } escape hatch applies MDX brace-escaping which
-        // would corrupt SVG content, so we use the plain html node form instead.
         async code(node, ctx) {
             if (!isLilypondLang(node.lang))
                 return undefined;
@@ -34,10 +31,7 @@ export function satteriPlugin(options) {
                     sourceName,
                 }),
             });
-            return {
-                type: "html",
-                value: renderedHtml(pages, alt),
-            };
+            return { rawHtml: renderedHtml(pages, alt) };
         },
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-lilypond",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "description": "An Astro integration for rendering Lilypond markup to music notation.",
   "homepage": "https://lilypond.ky.fyi",
   "author": "Ky Decker",
@@ -50,12 +50,12 @@
     "unist-util-visit": "^5.1.0"
   },
   "devDependencies": {
-    "@astrojs/markdown-remark": "^7.2.1",
-    "@astrojs/markdown-satteri": "^0.3.4",
+    "@astrojs/markdown-remark": "^7.2.2",
+    "@astrojs/markdown-satteri": "^0.3.5",
     "@types/mdast": "^4.0.4",
     "@types/node": "^26.1.1",
     "@vitest/coverage-v8": "^4.1.10",
-    "astro": "^7.0.8",
+    "astro": "^7.1.6",
     "satteri": "^0.9.5",
     "typescript": "^7.0.2",
     "unified": "^11.0.5",

package/dist/plugins/rehype.d.ts

@@ -1,4 +0,0 @@
-import type { PluginOptions } from "./types.js";
-export declare function rehypePlugin(options: PluginOptions): (tree: any, file?: {
-    path?: string;
-}) => Promise<void>;

package/dist/plugins/rehype.js

@@ -1,65 +0,0 @@
-import { visit } from "unist-util-visit";
-import { defaultOptions, render } from "../render.js";
-import { altTextForBlock, emitLilypondAsset, includePathsFor, isLilypondLang, prependVersion, renderedHtml, resolveDefaults, sourceNameFor, titleFor, } from "../utils/index.js";
-// Typed loosely so it's assignable to both RehypePlugin and the unified
-// Plugin generic regardless of which @types/hast version the host project pins.
-export function rehypePlugin(options) {
-    return async (tree, file) => {
-        const promises = [];
-        const includePaths = includePathsFor(file?.path);
-        const sourceName = sourceNameFor(file?.path);
-        const title = titleFor(sourceName);
-        visit(tree, "element", (node, index, parent) => {
-            if (node.tagName !== "pre" ||
-                node.children?.length !== 1 ||
-                node.children[0].type !== "element" ||
-                node.children[0].tagName !== "code" ||
-                index === undefined ||
-                !parent)
-                return;
-            const codeNode = node.children[0];
-            const cls = codeNode.properties?.className;
-            if (!Array.isArray(cls))
-                return;
-            const lang = cls
-                .find((c) => c.startsWith("language-"))
-                ?.slice("language-".length);
-            if (!isLilypondLang(lang))
-                return;
-            const raw = codeNode.children
-                .filter((c) => c.type === "text")
-                .map((c) => c.value)
-                .join("");
-            const { version, resolution, cropScale } = resolveDefaults(options.defaults);
-            const source = version ? prependVersion(raw, version) : raw;
-            const format = options.format ?? defaultOptions.format;
-            const alt = altTextForBlock(codeNode.data?.meta, raw);
-            const promise = emitLilypondAsset({
-                title,
-                format,
-                source,
-                resolution,
-                crop: true,
-                sizeScale: cropScale,
-                binaryPath: options.binaryPath,
-                render: () => render(source, {
-                    format,
-                    crop: true,
-                    defaults: options.defaults,
-                    timeout: options.timeout,
-                    binaryPath: options.binaryPath,
-                    includePaths,
-                    sourceName,
-                }),
-            }).then((pages) => {
-                const rawNode = {
-                    type: "raw",
-                    value: renderedHtml(pages, alt),
-                };
-                parent.children[index] = rawNode;
-            });
-            promises.push(promise);
-        });
-        await Promise.all(promises);
-    };
-}