@minamorl/markdown-next 2.2.1 → 2.2.2

package/lib/src/parser.js

@@ -171,7 +171,7 @@ class Parser {
         });
         const inlines = inline.atLeast(1).map(join);
         const paragraphBegin = inlines;
-        const paragraphEnd = ignore(/```\n.*\n```/);
+        const paragraphEnd = ignore(/```[^`\r\n]*\n[\s\S]*?\n```/);
         const paragraphLine = P.lazy(() => P.alt(P.seq(paragraphBegin, linebreak.skip(paragraphEnd).result(mapper('br')(null)), paragraphLine).map(join), inlines));
         const paragraph = paragraphLine.map(mapper('p'));
         const listIndent = P.string('  ');
@@ -278,9 +278,11 @@ class Parser {
         const codeBlockBegin = P.regexp(/^```/);
         const codeBlockEnd = P.regexp(/^```/);
         const codeBlockDefinitionStr = P.regexp(/[^`\r\n]*/);
-        const codeBlockStr = P.regexp(/[^\r\n]+/);
-        const codeBlock = P.seqMap(codeBlockBegin, codeBlockDefinitionStr, linebreak, linebreak.or(codeBlockStr.lookahead(linebreak)).many(), codeBlockEnd, (_1, definition, _2, code, _3) => {
-            if (code.length > 0) {
+        // Match a code line that is NOT a closing fence (``` at start of line)
+        const codeBlockStr = P.regexp(/(?!```)[^\r\n]+/);
+        const codeBlock = P.seqMap(codeBlockBegin, codeBlockDefinitionStr, linebreak, linebreak.or(codeBlockStr).many(), linebreak.atMost(1), codeBlockEnd, (_1, definition, _2, code, _3, _4) => {
+            // Remove trailing linebreak consumed by .many() before the closing fence
+            while (code.length > 0 && (code[code.length - 1] === '\n' || code[code.length - 1] === '\r\n' || code[code.length - 1] === '\r' || code[code.length - 1] === '')) {
                 code.pop();
             }
             if (definition === '')

package/package.json

@@ -3,6 +3,16 @@
   "description": "Markdown parser with Aozora bunko ruby support and HTML passthrough",
   "main": "./lib/src/parser.js",
   "types": "./lib/src/parser.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "example": "cd examples && webpack",
+    "prepublish": "pnpm run build",
+    "test": "pnpm run build && mocha lib/test",
+    "lint": "eslint src test",
+    "lint:fix": "eslint src test --fix",
+    "format": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
+    "format:check": "prettier --check 'src/**/*.ts' 'test/**/*.ts'"
+  },
   "author": "minamorl",
   "license": "MIT",
   "files": [
@@ -36,15 +46,5 @@
     "url": "https://github.com/minamorl/markdown-next/issues"
   },
   "homepage": "https://github.com/minamorl/markdown-next#readme",
-  "version": "2.2.1",
-  "scripts": {
-    "build": "tsc",
-    "example": "cd examples && webpack",
-    "prepublish": "pnpm run build",
-    "test": "pnpm run build && mocha lib/test",
-    "lint": "eslint src test",
-    "lint:fix": "eslint src test --fix",
-    "format": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
-    "format:check": "prettier --check 'src/**/*.ts' 'test/**/*.ts'"
-  }
-}
+  "version": "2.2.2"
+}