use plugin map / remove prerender

Author: dbushell

src/block-parser.ts

@@ -31,7 +31,7 @@ export const blockParser = (
     const line = allLines.pop()!;
     // Work with previous multi-line block
     if (type) {
-      const plugin = options.blockPlugins.find((p) => p.type === type);
+      const plugin = options.blockPlugins.get(type)!;
       if (plugin === undefined) throw new Error("undefined plugin");
       // Check for end of multi-line block
       if (plugin.matchEnd) {
@@ -50,7 +50,7 @@ export const blockParser = (
       continue;
     }
     // Check for new block match
-    for (const plugin of options.blockPlugins) {
+    for (const plugin of options.blockPlugins.values()) {
       let newMatches = plugin.matchStart(line, 0);
       if (newMatches === false) {
         continue;

src/block-stream.ts

@@ -36,7 +36,7 @@ export class BlockStream extends TransformStream<string, HmmBlock> {
         };
         // Work with previous multi-line block
         if (type) {
-          const plugin = options.blockPlugins.find((p) => p.type === type);
+          const plugin = options.blockPlugins.get(type)!;
           if (plugin === undefined) throw new Error("undefined plugin");
           // Check for end of multi-line block
           if (plugin.matchEnd) {
@@ -55,7 +55,7 @@ export class BlockStream extends TransformStream<string, HmmBlock> {
           return;
         }
         // Check for new block match
-        for (const plugin of options.blockPlugins) {
+        for (const plugin of options.blockPlugins.values()) {
           let newMatches = plugin.matchStart(line, 0);
           if (newMatches === false) {
             continue;

src/inline-plugins/anchor.ts

@@ -80,8 +80,10 @@ const plugin: InlinePlugin = {
       }
       text = await renderInline(text, {
         ...options,
-        inlinePlugins: options.inlinePlugins.filter((plugin) =>
-          inlinePlugins.includes(plugin.type)
+        inlinePlugins: new Map(
+          [...options.inlinePlugins].filter(([type]) =>
+            inlinePlugins.includes(type)
+          ),
         ),
       });
       out = out.replace(anchor, () => `<a href="${escape(href)}">${text}</a>`);

src/inline-plugins/code.ts

@@ -1,18 +1,9 @@
 import type { InlinePlugin } from "../types.ts";
-import { escape, unescape } from "@dbushell/hyperless";
 
 const REGEXP = /`([^`]+)`/g;
 
 const plugin: InlinePlugin = {
   type: "code",
-  prerender: (text: string) => {
-    if (text.indexOf("`") === -1) return text;
-    // Inline code is escaped early to avoid `<div>` being parsed as HTML node
-    return text.replace(REGEXP, (...match) => {
-      const text = unescape(match[0]);
-      return escape(text);
-    });
-  },
   render: (text: string) => {
     text = text.replace(REGEXP, (...match) => `<code>${match[1]}</code>`);
     return Promise.resolve(text);

src/mod.ts

@@ -1,7 +1,8 @@
 import type { HmmBlock, HmmOptions } from "./types.ts";
+import { TextLineStream } from "@std/streams/text-line-stream";
+import { escape, unescape } from "@dbushell/hyperless";
 import { blockParser } from "./block-parser.ts";
 import { BlockStream } from "./block-stream.ts";
-import { TextLineStream } from "@std/streams/text-line-stream";
 
 // Block Plugins
 import blockBlockquote from "./block-plugins/blockquote.ts";
@@ -25,27 +26,27 @@ import inlineTypography from "./inline-plugins/typography.ts";
 
 // Default options
 export const defaultOptions: HmmOptions = {
-  blockPlugins: [
-    blockBlockquote,
-    blockPreformatted,
-    blockHeading,
-    blockHorizontalRule,
-    blockImage,
-    blockOrderedList,
-    blockUnorderedList,
-    blockParagraph,
-  ],
+  blockPlugins: new Map([
+    [blockBlockquote.type, blockBlockquote],
+    [blockPreformatted.type, blockPreformatted],
+    [blockHeading.type, blockHeading],
+    [blockHorizontalRule.type, blockHorizontalRule],
+    [blockImage.type, blockImage],
+    [blockOrderedList.type, blockOrderedList],
+    [blockUnorderedList.type, blockUnorderedList],
+    [blockParagraph.type, blockParagraph],
+  ]),
   // Order is significant
-  inlinePlugins: [
-    inlineTypography,
-    inlineEscape,
-    inlineImage,
-    inlineAnchor,
-    inlineCode,
-    inlineStrong,
-    inlineEmphasis,
-    inlineDeleted,
-  ],
+  inlinePlugins: new Map([
+    [inlineTypography.type, inlineTypography],
+    [inlineEscape.type, inlineEscape],
+    [inlineImage.type, inlineImage],
+    [inlineAnchor.type, inlineAnchor],
+    [inlineCode.type, inlineCode],
+    [inlineStrong.type, inlineStrong],
+    [inlineEmphasis.type, inlineEmphasis],
+    [inlineDeleted.type, inlineDeleted],
+  ]),
 };
 
 export const parse = async (
@@ -66,26 +67,23 @@ export const parse = async (
       .pipeThrough(new BlockStream(options));
   }
 
-  // Get pre-render plugins
-  const prerender = options.inlinePlugins.filter((plugin) =>
-    Object.hasOwn(plugin, "prerender")
-  );
-
   // Final block renders
   const blocks: Array<Promise<string>> = [];
 
   for await (const block of stream) {
-    // Apply pre-render plugins to all lines
     if (block.type !== "preformatted") {
+      // Inline code is escaped early to avoid `<div>` being parsed as HTML node
       for (let i = 0; i < block.lines.length; i++) {
-        prerender.forEach((plugin) => {
-          block.lines[i] = plugin.prerender!(block.lines[i], options);
-        });
+        if (block.lines[i].includes("`") === false) continue;
+        block.lines[i] = block.lines[i].replace(
+          /`([^`]+)`/g,
+          (...match) => escape(unescape(match[0])),
+        );
       }
     }
     // Start block render
-    const plugin = options.blockPlugins.find((p) => p.type === block.type)!;
-    blocks.push(Promise.resolve(plugin.render(block, options)));
+    const plugin = options.blockPlugins.get(block.type)!;
+    blocks.push(plugin.render(block, options));
   }
   return blocks;
 };

src/render.ts

@@ -15,7 +15,7 @@ export const renderInline = async (
   text: string,
   options: HmmOptions,
 ): Promise<string> => {
-  for (const plugin of options.inlinePlugins) {
+  for (const plugin of options.inlinePlugins.values()) {
     if (["anchor", "code"].includes(plugin.type)) {
       text = await plugin.render(text, options);
     } else {

src/types.ts

@@ -19,11 +19,10 @@ export type BlockPlugin = {
 export type InlinePlugin = {
   type: string;
   render: (text: string, options: HmmOptions) => Promise<string>;
-  prerender?: (text: string, options: HmmOptions) => string;
 };
 
 /** Markdown block stream options */
 export type HmmOptions = {
-  blockPlugins: Array<BlockPlugin>;
-  inlinePlugins: Array<InlinePlugin>;
+  blockPlugins: Map<string, BlockPlugin>;
+  inlinePlugins: Map<string, InlinePlugin>;
 };