pantsdown 2.2.6 → 2.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pantsdown",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "Markdown to 'GitHub HTML' parser",
   "license": "MIT",
   "author": "wallpants",
@@ -8,6 +8,10 @@
     "type": "git",
     "url": "git://github.com/wallpants/pantsdown.git"
   },
+  "files": [
+    "src",
+    "!src/**/*.test.ts"
+  ],
   "type": "module",
   "exports": {
     "./*": "./*",
@@ -26,33 +30,29 @@
     "commit": "cz",
     "format": "oxfmt .",
     "typecheck": "tsc",
-    "lint": "eslint .",
+    "lint": "oxlint .",
     "check": "bun run typecheck && bun run lint",
     "docs:build": "bun run docs/build.ts"
   },
   "dependencies": {
     "github-slugger": "^2.0.0",
     "highlight.js": "^11.11.1",
-    "katex": "^0.17.0"
+    "katex": "^0.18.0"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "^21.0.2",
-    "@commitlint/cz-commitlint": "^21.0.2",
-    "@happy-dom/global-registrator": "^20.9.0",
+    "@commitlint/config-conventional": "^21.2.0",
+    "@commitlint/cz-commitlint": "^21.2.0",
+    "@happy-dom/global-registrator": "^20.11.0",
     "@types/bun": "^1.3.14",
     "@types/katex": "^0.16.8",
-    "@typescript-eslint/eslint-plugin": "^8.60.0",
-    "@typescript-eslint/parser": "^8.60.0",
-    "commitizen": "^4.3.1",
-    "commitlint": "^21.0.2",
-    "eslint": "^9.39.4",
-    "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-import-x": "^4.16.2",
+    "commitizen": "^4.3.2",
+    "commitlint": "^21.2.1",
     "inquirer": "^12.11.1",
-    "oxfmt": "^0.52.0",
-    "semantic-release": "^25.0.3",
-    "typescript": "6.0.3",
-    "typescript-eslint": "^8.60.0"
+    "oxfmt": "^0.59.0",
+    "oxlint": "^1.73.0",
+    "oxlint-tsgolint": "^0.25.0",
+    "semantic-release": "^25.0.8",
+    "typescript": "7.0.2"
   },
   "commitlint": {
     "extends": [

package/src/lexer.ts

@@ -31,6 +31,11 @@ export class Lexer {
       this.tokens = [];
       this.links = {};
       this.line = 1;
+      this.state = {
+         inLink: false,
+         inRawBlock: false,
+         top: true,
+      };
 
       src = src.replace(/\r\n|\r/g, "\n");
 

package/src/renderer.ts

@@ -33,7 +33,9 @@ export class Renderer {
 
       if (lang === "mermaid") {
          attrs.push(["class", "mermaid-container mermaid"]);
-         const result = `<pre style="position: relative;">` + code + "\n" + `</pre>`;
+         // escape so diagram source can't be parsed as HTML;
+         // mermaid reads textContent, which undoes the escaping
+         const result = `<pre style="position: relative;">` + escape(code, true) + "\n" + `</pre>`;
          return injectHtmlAttributes(result, attrs, sourceMap);
       }
 

package/src/tokenizer.ts

@@ -317,7 +317,8 @@ export class Tokenizer {
       const lastTrimmed = raw.trimEnd();
 
       if (list.items[list.items.length - 1]!.sourceMap) {
-         this.lexer.line -= raw.length - lastTrimmed.length;
+         // give back the trimmed trailing newlines; the counter tracks lines, not chars
+         this.lexer.line -= (raw.slice(lastTrimmed.length).match(/\n/g) ?? []).length;
       }
 
       list.items[list.items.length - 1]!.raw = lastTrimmed;
@@ -333,8 +334,7 @@ export class Tokenizer {
             // Check if list should be loose
             const spacers = list.items[i]!.tokens.filter((t) => t.type === "space");
             const hasMultipleLineBreaks =
-               // eslint-disable-next-line
-               spacers.length > 0 && spacers.some((t: any) => /\n.*\n/.test(t.raw));
+               spacers.length > 0 && spacers.some((t) => /\n.*\n/.test(t.raw));
 
             list.loose = hasMultipleLineBreaks;
          }
@@ -703,13 +703,11 @@ export class Tokenizer {
       // _ can't be between two alphanumerics. \p{L}\p{N} includes non-english alphabet/numbers as well
       if (match[3] && /[\p{L}\p{N}]/u.exec(prevChar)) return;
 
-      // eslint-disable-next-line
       const nextChar = match[1] || match[2] || "";
 
       if (!nextChar || !prevChar || inline.punctuation.exec(prevChar)) {
-         // unicode Regex counts emoji as 1 char; spread into array for proper count (used multiple times below)
-         // eslint-disable-next-line @typescript-eslint/no-misused-spread
-         const lLength = [...match[0]].length - 1;
+         // unicode Regex counts emoji as 1 char; convert to array for proper count (used multiple times below)
+         const lLength = Array.from(match[0]).length - 1;
          let rDelim,
             rLength,
             delimTotal = lLength,
@@ -724,13 +722,11 @@ export class Tokenizer {
          maskedSrc = maskedSrc.slice(-1 * src.length + lLength);
 
          while ((match = endReg.exec(maskedSrc)) != null) {
-            // eslint-disable-next-line
             rDelim = match[1] || match[2] || match[3] || match[4] || match[5] || match[6];
 
             if (!rDelim) continue; // skip single * in __abc*abc__
 
-            // eslint-disable-next-line @typescript-eslint/no-misused-spread
-            rLength = [...rDelim].length;
+            rLength = Array.from(rDelim).length;
 
             if (match[3] || match[4]) {
                // found another Left Delim
@@ -751,8 +747,7 @@ export class Tokenizer {
             // Remove extra characters. *a*** -> *a*
             rLength = Math.min(rLength, rLength + delimTotal + midDelimTotal);
             // char length can be >1 for unicode characters;
-            // eslint-disable-next-line @typescript-eslint/no-misused-spread
-            const lastCharLength = [...match[0]][0]!.length;
+            const lastCharLength = Array.from(match[0])[0]!.length;
             const raw = src.slice(0, lLength + match.index + lastCharLength + rLength);
 
             // Create `em` if smallest delimiter has odd char count. *a***

package/src/types.ts

@@ -9,7 +9,7 @@ type BaseToken = {
 
 export type SourceMap = [start: number, end: number] | undefined;
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+// eslint-disable-next-line typescript/consistent-type-definitions
 export interface Tokens extends Record<string, BaseToken> {
    Space: {
       type: "space";

package/src/utils.ts

@@ -37,10 +37,7 @@ export function getHtmlElementText(html: string) {
    try {
       const parser = new DOMParser();
       const doc = parser.parseFromString(html, "text/html");
-      // eslint-disable-next-line
-      if (!doc.body) throw Error("Invalid HTML");
-      const element = doc.body.firstChild as HTMLElement;
-      // eslint-disable-next-line
+      const element = doc.body.firstChild;
       if (!element) throw Error("No valid element found");
       return element.textContent || html;
    } catch (_) {
@@ -56,12 +53,15 @@ export function injectHtmlAttributes(html: string, attrs: HTMLAttrs, sourceMap?:
 
    if (!attrs.length) return html;
 
+   // closing tags cannot carry attributes
+   if (/^\s*<\//.test(html)) return html;
+
    const closingBracket = /[a-zA-Z0-9\/"]>/;
    const match = closingBracket.exec(html);
    if (match) {
       let htmlAttrs = "";
       attrs.forEach((atrr) => (htmlAttrs += ` ${atrr[0]}="${atrr[1]}"`));
-      const sliceIdx = match.index + (match[0] === "/>" ? -1 : 1);
+      const sliceIdx = match.index + (match[0] === "/>" ? 0 : 1);
       return html.slice(0, sliceIdx) + htmlAttrs + html.slice(sliceIdx);
    }
    return html;
@@ -314,7 +314,7 @@ export function indentCodeCompensation(raw: string, text: string) {
 }
 
 function makeAlertRegex(type: string) {
-   return new RegExp(`^(?:\\[\\!${type.toUpperCase()}\\]|[\\*]{2}${type}[\\*]{2})[\s]*?\n?`);
+   return new RegExp(`^(?:\\[\\!${type.toUpperCase()}\\]|[\\*]{2}${type}[\\*]{2})[ \\t]*\\n?`);
 }
 
 export const ALERTS = [

package/.oxfmtrc.json

@@ -1,17 +0,0 @@
-{
-  "$schema": "./node_modules/oxfmt/configuration_schema.json",
-  "ignorePatterns": [".github"],
-  "printWidth": 100,
-  "tabWidth": 3,
-  "sortImports": {
-    "newlinesBetween": false
-  },
-  "overrides": [
-    {
-      "files": ["*.json", "*.md"],
-      "options": {
-        "tabWidth": 2
-      }
-    }
-  ]
-}

package/CLAUDE.md

@@ -1,73 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Project Overview
-
-Pantsdown is a Markdown to HTML converter that renders markdown similar to GitHub's styling. It was built specifically for [github-preview.nvim](https://github.com/wallpants/github-preview.nvim). Based on [Marked](https://github.com/markedjs/marked).
-
-## Commands
-
-```bash
-# Type checking
-bun run typecheck
-
-# Linting
-bun run lint
-
-# Both typecheck and lint
-bun run check
-
-# Run tests (uses bun:test with happy-dom)
-bun test
-
-# Run a single test file
-bun test tests/parse.test.ts
-
-# Update test snapshots
-bun test --update-snapshots
-
-# Format code
-bun run format
-
-# Build docs
-bun run docs:build
-```
-
-## Architecture
-
-The parsing pipeline follows a classic compiler pattern:
-
-1. **Lexer** (`src/lexer.ts`) - Tokenizes markdown source into an array of tokens
-   - Uses `Tokenizer` for the actual token creation
-   - Processes block-level tokens first, then inline tokens
-   - Tracks source maps for line number references
-   - Collects footnotes separately
-
-2. **Tokenizer** (`src/tokenizer.ts`) - Creates tokens from markdown patterns
-   - Uses regex rules from `src/rules/block.ts` and `src/rules/inline.ts`
-
-3. **Parser** (`src/parser.ts`) - Converts tokens to HTML by dispatching to the Renderer
-   - Recursively processes nested tokens
-
-4. **Renderer** (`src/renderer.ts`) - Produces HTML output for each token type
-   - Uses highlight.js for syntax highlighting
-   - Uses github-slugger for heading anchors
-   - Handles special cases like mermaid diagrams and alerts
-
-Entry point: `Pantsdown` class in `src/pantsdown.ts` coordinates the pipeline.
-
-## Key Types
-
-All token types are defined in `src/types.ts`. The `Token` union type covers all possible markdown elements (headings, code blocks, lists, tables, footnotes, alerts, etc.).
-
-## Output
-
-`pantsdown.parse(markdown)` returns `{ html, javascript }`:
-
-- `html`: The rendered HTML string
-- `javascript`: A script for interactive features (task list checkboxes, copy buttons)
-
-## Styling
-
-CSS is in `src/css/styles.css`. Requires a parent element with classes `pantsdown light` or `pantsdown dark` (optionally with `high-contrast`).