Aggregate mdast -> hast handlers into one

Changes

3 changed files (+43/-21)

• content_parser/obsidian_markdown.ts
  • @@ -21,9 +21,7 @@ import type { DocumentContent } from "../types.ts";
    export { macanaReplaceAssetTokens } from "./obsidian_markdown/mdast_util_macana_replace_asset_tokens.ts"; export { macanaReplaceDocumentToken } from "./obsidian_markdown/mdast_util_macana_replace_document_tokens.ts"; - export { ofmWikilinkToHastHandlers } from "./obsidian_markdown/mdast_util_ofm_wikilink.ts"; - export { ofmCalloutToHastHandlers } from "./obsidian_markdown/mdast_util_ofm_callout.ts"; - export { ofmCommentToHastHandlers } from "./obsidian_markdown/mdast_util_ofm_comment.ts"; + export { ofmToHastHandlers } from "./obsidian_markdown/mdast_util_ofm.ts"; export type { CalloutType } from "./obsidian_markdown/mdast_util_ofm_callout.ts"; function getFrontMatterValue(
• content_parser/obsidian_markdown/mdast_util_ofm.ts
  • @@ -5,10 +5,21 @@
    import type { Extension } from "../../deps/esm.sh/mdast-util-from-markdown/mod.ts"; import { gfmFromMarkdown } from "../../deps/esm.sh/mdast-util-gfm/mod.ts"; - import { ofmCommentFromMarkdown } from "./mdast_util_ofm_comment.ts"; + import { + ofmCommentFromMarkdown, + ofmCommentToHastHandlers, + type OfmCommentToHastHandlersOptions, + } from "./mdast_util_ofm_comment.ts"; import { ofmHighlightFromMarkdown } from "./mdast_util_ofm_highlight.ts"; - import { ofmWikilinkFromMarkdown } from "./mdast_util_ofm_wikilink.ts"; - import { ofmCalloutFromMarkdown } from "./mdast_util_ofm_callout.ts"; + import { + ofmWikilinkFromMarkdown, + ofmWikilinkToHastHandlers, + } from "./mdast_util_ofm_wikilink.ts"; + import { + ofmCalloutFromMarkdown, + ofmCalloutToHastHandlers, + type OfmCalloutToHastHandlersOptions, + } from "./mdast_util_ofm_callout.ts"; import { ofmImageSize } from "./mdast_util_ofm_image_size.ts"; export function ofmFromMarkdown(): Extension[] {
  • @@ -21,3 +32,18 @@ ofmCalloutFromMarkdown(),
    ofmImageSize(), ]; } + + export interface OfmToHastHandlersOptions { + comment?: OfmCommentToHastHandlersOptions; + callout?: OfmCalloutToHastHandlersOptions; + } + + export function ofmToHastHandlers( + { comment, callout }: OfmToHastHandlersOptions = {}, + ) { + return { + ...ofmCalloutToHastHandlers(callout), + ...ofmWikilinkToHastHandlers, + ...ofmCommentToHastHandlers(comment), + }; + }
• page_builder/default_theme/components/html.tsx
  • @@ -20,9 +20,7 @@ } from "../../../types.ts";
    import { type CalloutType, type ObsidianMarkdownDocument, - ofmCalloutToHastHandlers, - ofmCommentToHastHandlers, - ofmWikilinkToHastHandlers, + ofmToHastHandlers, } from "../../../content_parser/obsidian_markdown.ts"; import type { JSONCanvasDocument } from "../../../content_parser/json_canvas.ts"; import * as jsonCanvas from "../../../content_parser/json_canvas/utils.ts";
  • @@ -181,20 +179,20 @@ return toHast(input, {
    // @ts-expect-error: unist-related libraries heavily relies on ambient module declarations, // which Deno does not support. APIs also don't accept type parameters. handlers: { - ...ofmCalloutToHastHandlers({ - generateIcon(type) { - return { - type: "element", - tagName: "MacanaOfmCalloutIcon", - properties: { - type, - }, - children: [], - }; + ...ofmToHastHandlers({ + callout: { + generateIcon(type) { + return { + type: "element", + tagName: "MacanaOfmCalloutIcon", + properties: { + type, + }, + children: [], + }; + }, }, }), - ...ofmCommentToHastHandlers(), - ...ofmWikilinkToHastHandlers, ...syntaxHighlightingHandlers(), }, });