Merge pull request #538 from progfay/fix-parsing-deco-strong-complex

Author: progfay

src/block/node/index.ts

@@ -47,10 +47,10 @@ export const convertToNodes = combineNodeParsers(
   CommandLineNodeParser,
   FormulaNodeParser,
   BlankNodeParser,
+  DecorationNodeParser,
   StrongImageNodeParser,
   StrongIconNodeParser,
   StrongNodeParser,
-  DecorationNodeParser,
   ImageNodeParser,
   ExternalLinkNodeParser,
   IconNodeParser,

tests/line/__snapshots__/decoration.test.ts.snap

@@ -65,20 +65,26 @@ Array [
     "indent": 0,
     "nodes": Array [
       Object {
-        "raw": "[! ",
-        "text": "[! ",
-        "type": "plain",
-      },
-      Object {
+        "decos": Array [
+          "!",
+        ],
         "nodes": Array [
           Object {
-            "raw": "[[[[a",
-            "text": "[[[[a",
+            "raw": "[[[[[",
+            "text": "[[[[[",
             "type": "plain",
           },
+          Object {
+            "content": "",
+            "href": "a",
+            "pathType": "relative",
+            "raw": "[a]",
+            "type": "link",
+          },
         ],
-        "raw": "[[[[[[a]]",
-        "type": "strong",
+        "raw": "[! [[[[[[a]]",
+        "rawDecos": "!",
+        "type": "decoration",
       },
     ],
     "type": "line",
@@ -112,6 +118,119 @@ Array [
 ]
 `;
 
+exports[`decoration Decoration with strong icon notation (it's just icon, not strong): toMatchSnapshotWhenParsing 1`] = `
+Array [
+  Object {
+    "indent": 0,
+    "nodes": Array [
+      Object {
+        "decos": Array [
+          "*-1",
+        ],
+        "nodes": Array [
+          Object {
+            "raw": "[",
+            "text": "[",
+            "type": "plain",
+          },
+          Object {
+            "content": "",
+            "href": "progfay.icon",
+            "pathType": "relative",
+            "raw": "[progfay.icon]",
+            "type": "link",
+          },
+        ],
+        "raw": "[* [[progfay.icon]]",
+        "rawDecos": "*",
+        "type": "decoration",
+      },
+      Object {
+        "raw": "]",
+        "text": "]",
+        "type": "plain",
+      },
+    ],
+    "type": "line",
+  },
+]
+`;
+
+exports[`decoration Decoration with strong image notation (it's just image, not strong): toMatchSnapshotWhenParsing 1`] = `
+Array [
+  Object {
+    "indent": 0,
+    "nodes": Array [
+      Object {
+        "decos": Array [
+          "*-1",
+        ],
+        "nodes": Array [
+          Object {
+            "raw": "[",
+            "text": "[",
+            "type": "plain",
+          },
+          Object {
+            "link": "",
+            "raw": "[https://example.com/image.png]",
+            "src": "https://example.com/image.png",
+            "type": "image",
+          },
+        ],
+        "raw": "[* [[https://example.com/image.png]]",
+        "rawDecos": "*",
+        "type": "decoration",
+      },
+      Object {
+        "raw": "]",
+        "text": "]",
+        "type": "plain",
+      },
+    ],
+    "type": "line",
+  },
+]
+`;
+
+exports[`decoration Decoration with strong notation (it's just link): toMatchSnapshotWhenParsing 1`] = `
+Array [
+  Object {
+    "indent": 0,
+    "nodes": Array [
+      Object {
+        "decos": Array [
+          "*-1",
+        ],
+        "nodes": Array [
+          Object {
+            "raw": "[",
+            "text": "[",
+            "type": "plain",
+          },
+          Object {
+            "content": "",
+            "href": "link",
+            "pathType": "relative",
+            "raw": "[link]",
+            "type": "link",
+          },
+        ],
+        "raw": "[* [[link]]",
+        "rawDecos": "*",
+        "type": "decoration",
+      },
+      Object {
+        "raw": "]",
+        "text": "]",
+        "type": "plain",
+      },
+    ],
+    "type": "line",
+  },
+]
+`;
+
 exports[`decoration Simple decoration: toMatchSnapshotWhenParsing 1`] = `
 Array [
   Object {

tests/line/__snapshots__/strong.test.ts.snap

@@ -16,6 +16,42 @@ Array [
 ]
 `;
 
+exports[`strong Decoration in Strong notation: toMatchSnapshotWhenParsing 1`] = `
+Array [
+  Object {
+    "indent": 0,
+    "nodes": Array [
+      Object {
+        "raw": "[[",
+        "text": "[[",
+        "type": "plain",
+      },
+      Object {
+        "decos": Array [
+          "!",
+        ],
+        "nodes": Array [
+          Object {
+            "raw": "deco",
+            "text": "deco",
+            "type": "plain",
+          },
+        ],
+        "raw": "[! deco]",
+        "rawDecos": "!",
+        "type": "decoration",
+      },
+      Object {
+        "raw": "]]",
+        "text": "]]",
+        "type": "plain",
+      },
+    ],
+    "type": "line",
+  },
+]
+`;
+
 exports[`strong Simple strong: toMatchSnapshotWhenParsing 1`] = `
 Array [
   Object {

tests/line/decoration.test.ts

@@ -81,4 +81,16 @@ describe('decoration', () => {
   it('Decoration with many [ and link', () => {
     expect('[! [[[[[[a]]').toMatchSnapshotWhenParsing({ hasTitle: false })
   })
+
+  it("Decoration with strong notation (it's just link)", () => {
+    expect('[* [[link]]]').toMatchSnapshotWhenParsing({ hasTitle: false })
+  })
+
+  it("Decoration with strong icon notation (it's just icon, not strong)", () => {
+    expect('[* [[progfay.icon]]]').toMatchSnapshotWhenParsing({ hasTitle: false })
+  })
+
+  it("Decoration with strong image notation (it's just image, not strong)", () => {
+    expect('[* [[https://example.com/image.png]]]').toMatchSnapshotWhenParsing({ hasTitle: false })
+  })
 })

tests/line/strong.test.ts

@@ -6,4 +6,8 @@ describe('strong', () => {
   it('[[]] is not strong', () => {
     expect('[[]]').toMatchSnapshotWhenParsing({ hasTitle: false })
   })
+
+  it('Decoration in Strong notation', () => {
+    expect('[[[! deco]]]').toMatchSnapshotWhenParsing({ hasTitle: false })
+  })
 })