pantsdown 2.1.0 → 2.1.2

package/package.json

@@ -2,7 +2,7 @@
   "name": "pantsdown",
   "author": "wallpants",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "license": "MIT",
   "description": "Markdown to 'GitHub HTML' parser",
   "repository": {
@@ -28,7 +28,7 @@
   },
   "config": {
     "commitizen": {
-      "path": "./cz-adapter.cjs"
+      "path": "@commitlint/cz-commitlint"
     }
   },
   "commitlint": {
@@ -44,7 +44,9 @@
   "scripts": {
     "commit": "cz",
     "format": "prettier **/*.{md,ts,css,yml} -w",
-    "lint": "tsc && eslint . --ext ts --report-unused-disable-directives --max-warnings 0",
+    "typecheck": "tsc",
+    "lint": "eslint . --ext ts --report-unused-disable-directives --max-warnings 0",
+    "check": "bun run typecheck && bun run lint",
     "docs:build": "bun run docs/build.ts"
   },
   "dependencies": {
@@ -52,19 +54,18 @@
     "highlight.js": "^11.9.0"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "^19.0.3",
-    "@commitlint/cz-commitlint": "^19.0.3",
-    "@happy-dom/global-registrator": "^13.6.0",
-    "@types/bun": "^1.0.8",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.1",
+    "@commitlint/config-conventional": "^19.1.0",
+    "@commitlint/cz-commitlint": "^19.2.0",
+    "@happy-dom/global-registrator": "^14.7.1",
+    "@types/bun": "^1.0.12",
+    "@typescript-eslint/eslint-plugin": "^7.8.0",
+    "@typescript-eslint/parser": "^7.8.0",
     "commitizen": "^4.3.0",
-    "commitlint": "^19.0.3",
+    "commitlint": "^19.3.0",
     "eslint": "^8.57.0",
-    "inquirer": "^9.2.15",
     "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^3.2.4",
-    "semantic-release": "^23.0.2",
-    "typescript": "5.3.3"
+    "semantic-release": "^23.0.6",
+    "typescript": "5.4.5"
   }
 }

package/src/lexer.ts

@@ -36,10 +36,10 @@ export class Lexer {
 
         this.blockTokens(src, this.tokens);
 
-        let next;
-        while ((next = this.inlineQueue.shift())) {
+        for (const next of this.inlineQueue) {
             this.inlineTokens(next.src, next.tokens);
         }
+        this.inlineQueue = [];
 
         const footnotesToken: Tokens["Footnotes"] = {
             type: "footnotes",
@@ -71,7 +71,7 @@ export class Lexer {
      * Lexing
      */
     blockTokens(src: string, tokens: Token[]): Token[] {
-        src = src.replace(/^( *)(\t+)/gm, (_, leading, tabs: string) => {
+        src = src.replace(/^( *)(\t+)/gm, (_, leading: string, tabs: string) => {
             return leading + "    ".repeat(tabs.length);
         });
 
@@ -228,7 +228,7 @@ export class Lexer {
             }
 
             if (src) {
-                const errMsg = "Infinite loop on byte: " + src.charCodeAt(0);
+                const errMsg = "Infinite loop on byte: " + String(src.charCodeAt(0));
                 throw new Error(errMsg);
             }
         }
@@ -401,7 +401,7 @@ export class Lexer {
             }
 
             if (src) {
-                const errMsg = "Infinite loop on byte: " + src.charCodeAt(0);
+                const errMsg = "Infinite loop on byte: " + String(src.charCodeAt(0));
                 throw new Error(errMsg);
             }
         }

package/src/rules/block.ts

@@ -25,8 +25,8 @@ const tag =
     "|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption" +
     "|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe" +
     "|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option" +
-    "|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr" +
-    "|track|ul";
+    "|p|param|search|section|summary|table|tbody|td|tfoot|th|thead|title" +
+    "|tr|track|ul";
 
 const title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
 
@@ -49,7 +49,7 @@ const block_list = edit(/^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/)
     .replace("def", "\\n+(?=" + block_def.source + ")")
     .getRegex();
 
-export const comment = /<!--(?!-?>)[\s\S]*?(?:-->|$)/;
+export const comment = /<!--(?:-?>|[\s\S]*?(?:-->|$))/;
 
 const block_html = edit(
     "^ {0,3}(?:" + // optional indentation
@@ -72,8 +72,16 @@ const block_html = edit(
     )
     .getRegex();
 
-const block_lheading = edit(/^(?!bull )((?:.|\n(?!\s*?\n|bull ))+?)\n {0,3}(=+|-+) *(?:\n+|$)/)
+// const block_lheading = edit(/^(?!bull )((?:.|\n(?!\s*?\n|bull ))+?)\n {0,3}(=+|-+) *(?:\n+|$)/)
+const block_lheading = edit(
+    /^(?!bull |blockCode|fences|blockquote|heading|html)((?:.|\n(?!\s*?\n|bull |blockCode|fences|blockquote|heading|html))+?)\n {0,3}(=+|-+) *(?:\n+|$)/,
+)
     .replace(/bull/g, block_bullet) // lists can interrupt
+    .replace(/blockCode/g, / {4}/) // indented code blocks can interrupt
+    .replace(/fences/g, / {0,3}(?:`{3,}|~{3,})/) // fenced code blocks can interrupt
+    .replace(/blockquote/g, / {0,3}>/) // blockquote can interrupt
+    .replace(/heading/g, / {0,3}#{1,6}/) // ATX heading can interrupt
+    .replace(/html/g, / {0,3}<[^\n>]+>\n/) // block html can interrupt
     .getRegex();
 
 const block_hr = /^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/;
@@ -98,7 +106,7 @@ const block_paragraph = edit(
 )
     .replace("hr", block_hr)
     .replace("heading", " {0,3}#{1,6}(?:\\s|$)")
-    .replace("|lheading", "") // setex headings don't interrupt commonmark paragraphs
+    .replace("|lheading", "") // setext headings don't interrupt commonmark paragraphs
     .replace("table", block_table) // interrupt paragraphs with table
     .replace("blockquote", " {0,3}>")
     .replace("fences", " {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n")

package/src/rules/inline.ts

@@ -22,7 +22,7 @@ type InlineRuleNames =
     | "backpedal";
 
 // list of unicode punctuation marks, plus any missing characters from CommonMark spec
-const punctuation = "\\p{P}$+<=>`^|~";
+const punctuation = "\\p{P}\\p{S}";
 const title = /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/;
 const href = /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/;
 const scheme = /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/;

package/src/tokenizer.ts

@@ -105,7 +105,9 @@ export class Tokenizer {
         const cap = block.blockquote.exec(src);
         if (!cap) return undefined;
 
-        let text = rtrim(cap[0].replace(/^ *>[ \t]?/gm, ""), "\n");
+        // precede setext continuation with 4 spaces so it isn't a setext
+        let text = cap[0].replace(/\n {0,3}((?:=+|-+) *)(?=\n|$)/g, "\n    $1");
+        text = rtrim(text.replace(/^ *>[ \t]?/gm, ""), "\n");
         const top = this.lexer.state.top;
         this.lexer.state.top = true;
         const tokens = this.lexer.blockTokens(text, []);

package/cz-adapter.cjs

@@ -1,9 +0,0 @@
-/* eslint-disable */
-
-// this bridge adapter as workaround for ESM version of commitlint
-// https://github.com/conventional-changelog/commitlint/issues/3949
-
-// @ts-ignore
-exports.prompter = async (inquirerIns, commit) => {
-    (await import("@commitlint/cz-commitlint")).prompter(inquirerIns, commit);
-};