pantsdown 1.8.1 → 1.8.3

package/README.md

@@ -137,9 +137,3 @@ console.log(html);
 
 Pantsdown is based on [Marked](https://github.com/markedjs/marked).
 Without their hard work, Pantsdown would not exist.
-
-## 🚀 Roadmap
-
--   [ ] fix alerts css. see "alerts" in demo
--   [ ] check if copy code button works with current vite docs
--   [ ] [Mermaid](https://mermaid.js.org/) usage docs.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pantsdown",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "author": "wallpants",
   "description": "Markdown to 'GitHub HTML' parser",
   "license": "MIT",

package/src/code-copy.ts

@@ -1,6 +1,9 @@
 export const codeCopyScript = `
 <script id="code-copy-script" type="module">
     document.querySelectorAll("pre").forEach((pre) => {
+        const firstElement = pre.firstElementChild;
+        if (!firstElement || firstElement.tagName !== "CODE") return;
+
         const copyButton = document.createElement("button");
 
         const innerHTML =

package/src/renderer.ts

@@ -32,24 +32,18 @@ export class Renderer {
         const lang = (infostring ?? "").match(/^\S*/)?.[0];
         code = code.replace(/\n$/, "") + "\n";
 
-        // TODO: render pre and code instead of this section
+        const attrs: HTMLAttrs = [];
+
         if (lang === "mermaid") {
-            return injectHtmlAttributes(
-                `<section><div class="mermaid">${code}</div></section>`,
-                [["class", "mermaid-container"]],
-                sourceMap,
-            );
+            attrs.push(["class", "mermaid-container mermaid"]);
+        } else {
+            const language = lang && hljs.getLanguage(lang) ? lang : "plaintext";
+            code = hljs.highlight(code, { language }).value;
+            code = `<code class="hljs language-${escape(language)}">${code}</code>`;
         }
 
-        const language = lang && hljs.getLanguage(lang) ? lang : "plaintext";
-        const highlightedCode = hljs.highlight(code, { language }).value;
-
-        const result =
-            `<pre style="position: relative;">` +
-            `<code class="hljs language-${escape(language)}">${highlightedCode}</code>` +
-            `</pre>`;
-
-        return injectHtmlAttributes(result, [], sourceMap);
+        const result = `<pre style="position: relative;">` + code + `</pre>`;
+        return injectHtmlAttributes(result, attrs, sourceMap);
     }
 
     alert(body: string, token: Tokens["Alert"]): string {

package/src/tokenizer.ts

@@ -725,7 +725,7 @@ export class Tokenizer {
             endReg.lastIndex = 0;
 
             // Clip maskedSrc to same section of string as src (move to lexer?)
-            maskedSrc = maskedSrc.slice(-1 * src.length + match[0].length - 1);
+            maskedSrc = maskedSrc.slice(-1 * src.length + lLength);
 
             while ((match = endReg.exec(maskedSrc)) != null) {
                 // eslint-disable-next-line
@@ -755,8 +755,9 @@ export class Tokenizer {
 
                 // Remove extra characters. *a*** -> *a*
                 rLength = Math.min(rLength, rLength + delimTotal + midDelimTotal);
-
-                const raw = [...src].slice(0, lLength + match.index + rLength + 1).join("");
+                // char length can be >1 for unicode characters;
+                const lastCharLength = [...match[0]]![0]!.length;
+                const raw = src.slice(0, lLength + match.index + lastCharLength + rLength);
 
                 // Create `em` if smallest delimiter has odd char count. *a***
                 if (Math.min(lLength, rLength) % 2) {