Merge branch 'next'

__tests__/flavored-compilers/break.test.js

@@ -1,4 +1,4 @@
-import { mdast, md } from '../..';
+import { mdast, md } from '../../index';
 
 describe('break compiler', () => {
   it('uses two spaces with `correctnewlines: false`', () => {

__tests__/index.test.js

@@ -26,6 +26,7 @@ test('it should have the proper utils exports', () => {
       spacedTable: true,
       paddedTable: true,
     },
+    normalize: true,
     reusableContent: {},
     safeMode: false,
     settings: { position: false },

__tests__/normalize.test.js

@@ -0,0 +1,38 @@
+import { mdast } from '../index';
+
+describe('normalize option', () => {
+  it('normalizes magic block newlines', () => {
+    const doc = `
+> blockquote
+>
+[block:image]
+{
+  "images": [
+    {
+      "image": [
+        "https://owlbertsio-resized.s3.amazonaws.com/This-Is-Fine.jpg.full.png",
+        "",
+        ""
+      ],
+      "align": "center"
+    }
+  ]
+}
+[/block]
+`;
+    const tree = mdast(doc);
+
+    expect(tree.children[1].type).toBe('image');
+  });
+
+  it('does not normalize nested magic blocks', () => {
+    const doc = `
+> blockquote
+>
+> [block:image]{ "images": [ { "image": [ "https://owlbertsio-resized.s3.amazonaws.com/This-Is-Fine.jpg.full.png", "", "" ], "align": "center" } ]}[/block]
+`;
+    const tree = mdast(doc, { normalize: false });
+
+    expect(tree.children[0].children[1].type).toBe('image');
+  });
+});

index.js

@@ -65,6 +65,11 @@ export function setup(blocks, opts = {}) {
     Object.values(Components).forEach(Component => Component.sanitize && Component.sanitize(opts.sanitize));
   }
 
+  // normalize magic block linebreaks
+  if (opts.normalize && blocks) {
+    blocks = blocks.replace(/^\[block:/gm, '\n[block:').replace(/^\[\/block\]/gm, '[/block]\n');
+  }
+
   return [`${blocks}\n\n `, opts];
 }
 

options.js

@@ -12,6 +12,7 @@ const options = {
     spacedTable: true,
     paddedTable: true,
   },
+  normalize: true,
   lazyImages: true,
   reusableContent: {},
   safeMode: false,