Improve title parsing (#34)

croct-tech · Sep 25, 2024 · 5ee27da · 5ee27da
1 parent e179ed1
commit 5ee27da
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 5 deletions.
diff --git a/src/parsing.ts b/src/parsing.ts
@@ -290,14 +290,24 @@ class MarkdownParser {
 
                 this.match('](');
 
-                const [href, titleWithEndQuote] = this.parseText(')').split(/\s+"/);
+                const href = this.parseText(')', '"');
+
+                let title: string|undefined;
+
+                if (this.matches('"')) {
+                    this.match('"');
+
+                    title = this.parseText('"');
+
+                    this.match('"');
+                }
 
                 this.match(')');
 
                 return {
                     type: 'link',
-                    href: href,
-                    title: titleWithEndQuote?.slice(0, -1) /* remove quote character at the end */,
+                    href: href.trim(),
+                    ...(title !== undefined ? {title: title} : {}),
                     children: label,
                     source: this.getSlice(startIndex, this.index),
                 };
@@ -308,7 +318,7 @@ class MarkdownParser {
         }
     }
 
-    private parseText(end: string): string {
+    private parseText(...end: string[]): string {
         let text = '';
 
         while (!this.done) {
@@ -322,7 +332,7 @@ class MarkdownParser {
                 continue;
             }
 
-            if (end === '' || this.matches(end) || this.matches(...MarkdownParser.NEWLINE)) {
+            if (end.some(token => (token === '' || this.matches(token))) || this.matches(...MarkdownParser.NEWLINE)) {
                 break;
             }
 

diff --git a/test/parsing.test.ts b/test/parsing.test.ts
@@ -946,6 +946,35 @@ describe('A Markdown parser function', () => {
                 ],
             },
         },
+        'link with spaces': {
+            input: 'Hello, [world]( image.png )!',
+            output: {
+                type: 'fragment',
+                source: 'Hello, [world]( image.png )!',
+                children: [
+                    {
+                        type: 'text',
+                        source: 'Hello, ',
+                        content: 'Hello, ',
+                    },
+                    {
+                        type: 'link',
+                        source: '[world]( image.png )',
+                        href: 'image.png',
+                        children: {
+                            type: 'text',
+                            source: 'world',
+                            content: 'world',
+                        },
+                    },
+                    {
+                        type: 'text',
+                        source: '!',
+                        content: '!',
+                    },
+                ],
+            },
+        },
         'fenced code (unsupported)': {
             input: 'Hello, ```world```!',
             output: {
@@ -1149,6 +1178,36 @@ describe('A Markdown parser function', () => {
                 ],
             },
         },
+        'link with title and escaped quote': {
+            input: 'Hello, [world](image.png "The \\"world\\"")!',
+            output: {
+                type: 'fragment',
+                source: 'Hello, [world](image.png "The \\"world\\"")!',
+                children: [
+                    {
+                        type: 'text',
+                        source: 'Hello, ',
+                        content: 'Hello, ',
+                    },
+                    {
+                        type: 'link',
+                        source: '[world](image.png "The \\"world\\"")',
+                        href: 'image.png',
+                        title: 'The "world"',
+                        children: {
+                            type: 'text',
+                            source: 'world',
+                            content: 'world',
+                        },
+                    },
+                    {
+                        type: 'text',
+                        source: '!',
+                        content: '!',
+                    },
+                ],
+            },
+        },
         image: {
             input: 'Hello, ![world](image.png)!',
             output: {